Merge branch 'newpwa' of tau.ep1.rub.de:/var/www/git/Pawian into newpwa

PwaUtils/AbsDecay.cc

@@ -332,3 +332,25 @@ void AbsDecay::print(std::ostream& os) const{
 
   os << "\n";
 }
+
+
+ void AbsDecay::resetFilledMap() {
+   _alreadyFilledMap.clear();
+
+   if(_isProdAmp){
+     if (!_daughter1IsStable){
+       _absDecDaughter1->resetFilledMap();
+     }
+     if (!_daughter2IsStable){
+       _absDecDaughter2->resetFilledMap();
+     }
+   }
+   else{
+     if (!_daughter1IsStable){
+       _absDecDaughter1->resetFilledMap();
+     }
+     if (!_daughter2IsStable){
+       _absDecDaughter2->resetFilledMap();
+     }
+   }
+}

PwaUtils/AbsDecay.hh

@@ -97,6 +97,9 @@ public:
   virtual std::string pathToConfigParser() {return _pathParserFile;}
   void setProductionAmp() {_isProdAmp=true;}
   bool isProductionAmp() {return _isProdAmp;}
+
+  void resetFilledMap();
+
 protected:
   ChannelID _channelId;
 

PwaUtils/EvtDataBaseList.cc

@@ -145,6 +145,11 @@ EvtData* EvtDataBaseList::convertEvent(Event* theEvent, int evtNo){
       (*itDyn)->fillMasses(evtData);
     };
 
+   //reset filled map
+    for (itIso=theDecays.begin(); itIso!=theDecays.end(); ++itIso){
+      (*itIso)->resetFilledMap();
+    }
+
     return evtData;
 }
 

PwaUtils/LSDecAmps.hh

@@ -71,7 +71,7 @@ protected:
   std::vector< std::shared_ptr<const LScomb> > _LSs;
   double _factorMag;
   double _parityFactor;
-  std::map< std::shared_ptr<const LScomb>, map<Spin,map<Spin, double > > > _cgPreFactor;
+  std::map< std::shared_ptr<const LScomb>, map<Spin,map<Spin, double > >, pawian::Collection::SharedPtrLess > _cgPreFactor;
   std::map< std::shared_ptr<const LScomb>, double, pawian::Collection::SharedPtrLess > _currentParamMags;
   std::map< std::shared_ptr<const LScomb>, double, pawian::Collection::SharedPtrLess > _currentParamPhis;