improved performance for omega decay to 3 pions in tensor formalism

PwaUtils/AbsXdecAmp.hh

@@ -45,7 +45,6 @@
 class AbsDecay;
 //class AbsDynamics;
 
-//typedef CacheVector<std::map<std::string,std::map<Id2StringType, complex<float> > > >  intStringShortComplFloatMap;
 typedef CacheVector<std::map<unsigned short, std::map<Id2StringType, complex<float> > > >  intUShortId2StringComplFloatMap;
 
 class AbsXdecAmp : public AbsParamHandler{

PwaUtils/TensorOmegaTo3PiDecAmps.cc

@@ -73,7 +73,7 @@ complex<double> TensorOmegaTo3PiDecAmps::XdecAmp(Spin& lamX, EvtData* theData, S
   Id1StringType currentSpinIndex=FunctionUtils::spin1Index(lamX);
   
   if ( _cacheAmps && !_recalculate){
-    result=_cachedLocalAmpMap.at(evtNo).at(_absDyn->grandMaKey(grandmaAmp)).at(currentSpinIndex);
+    result=_cachedLocalAmpIdMap.at(evtNo).at(_absDyn->grandMaId(grandmaAmp)).at(currentSpinIndex);
     return result;
   }
 
@@ -88,7 +88,7 @@ complex<double> TensorOmegaTo3PiDecAmps::XdecAmp(Spin& lamX, EvtData* theData, S
   result*=100.;
   if ( _cacheAmps){
      theMutex.lock();
-     _cachedLocalAmpMap[evtNo][_absDyn->grandMaKey(grandmaAmp)][currentSpinIndex]=result;
+     _cachedLocalAmpIdMap[evtNo][_absDyn->grandMaId(grandmaAmp)][currentSpinIndex]=result;
      theMutex.unlock();
   }
 

PwaUtils/TensorOmegaTo3PiDecAmps.hh

@@ -41,7 +41,7 @@ class OmegaTo3PiTensorDecay;
 class Particle;
 class AbsPawianParameters;
 
-typedef CacheVector<std::map<std::string,std::map<Id1StringType, complex<float> > > >  tensorOmegaTo3PiCachedMap;
+typedef CacheVector<std::map<unsigned short,std::map<Id1StringType, complex<float> > > >  tensorOmegaTo3PiCachedIdMap;
 
 class TensorOmegaTo3PiDecAmps : public AbsXdecAmp{
 
@@ -79,7 +79,7 @@ protected:
   Particle* _daughter1;
   Particle* _daughter2;
   Particle* _daughter3;
-  tensorOmegaTo3PiCachedMap _cachedLocalAmpMap;
+  tensorOmegaTo3PiCachedIdMap _cachedLocalAmpIdMap;
 private: