Added additional variables to the VarManager and add an additional constructor...

Added additional variables to the VarManager and add an additional constructor and setter for more flexible scaling of thermal signals in runtime

analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.cxx

@@ -68,6 +68,49 @@ AnalysisTaskMultiPairAnalysis::AnalysisTaskMultiPairAnalysis(const char* name)
   fListHistos.SetOwner();
 }
 
+//_________________________________________________________________________________
+AnalysisTaskMultiPairAnalysis::AnalysisTaskMultiPairAnalysis(const char *name,Int_t id) :
+  FairTask(name),
+  fMetaData(),
+  fListPairAnalysis(),
+  fListHistos(),
+  fTimer(),
+  fProcInfo()
+{
+  //
+  // Named Constructor
+  //
+  fMetaData.SetName(Form("PairAnalysisMetaData_%s",name));
+  fListHistos.SetName(Form("PairAnalysisHistos_%s",name));
+  fListPairAnalysis.SetOwner();
+  ((TList*)fMetaData.GetMetaData())->SetOwner();
+  fListHistos.SetOwner();
+  fId = id;
+}
+
+
+//_________________________________________________________________________________
+AnalysisTaskMultiPairAnalysis::AnalysisTaskMultiPairAnalysis(const char *name,Int_t id,Int_t scale) :
+  FairTask(name),
+  fMetaData(),
+  fListPairAnalysis(),
+  fListHistos(),
+  fTimer(),
+  fProcInfo()
+{
+  //
+  // Named Constructor
+  //
+  fMetaData.SetName(Form("PairAnalysisMetaData_%s",name));
+  fListHistos.SetName(Form("PairAnalysisHistos_%s",name));
+  fListPairAnalysis.SetOwner();
+  ((TList*)fMetaData.GetMetaData())->SetOwner();
+  fListHistos.SetOwner();
+  fId = id;
+  fThermalScaling = scale;
+}
+
+
 //_________________________________________________________________________________
 AnalysisTaskMultiPairAnalysis::~AnalysisTaskMultiPairAnalysis() {
   //
@@ -140,13 +183,15 @@ InitStatus AnalysisTaskMultiPairAnalysis::Init() {
   // Init the input event
   fInputEvent = new PairAnalysisEvent();
   fInputEvent->SetInput(man);
-
+  fInputEvent->SetANNId(fId);
+  
   // Connect the MC event
   PairAnalysisMC::Instance()->ConnectMCEvent();
 
   // set the beam energy to the varmanager
   PairAnalysisVarManager::SetValue(PairAnalysisVarManager::kEbeam, fBeamEnergy);
-
+  PairAnalysisVarManager::SetValue(PairAnalysisVarManager::kThermalScaling, fThermalScaling);
+  
   // initialization time and memory
   gSystem->GetProcInfo(&fProcInfo);
   fprintf(stderr,

analysis/PWGDIL/dielectron/papaframework/AnalysisTaskMultiPairAnalysis.h

@@ -30,6 +30,8 @@ class AnalysisTaskMultiPairAnalysis : public FairTask {
 public:
   AnalysisTaskMultiPairAnalysis();
   AnalysisTaskMultiPairAnalysis(const char* name);
+  AnalysisTaskMultiPairAnalysis(const char *name,Int_t id);
+  AnalysisTaskMultiPairAnalysis(const char *name,Int_t id,Int_t scale);
   virtual ~AnalysisTaskMultiPairAnalysis();
 
   virtual InitStatus Init();
@@ -58,7 +60,8 @@ protected:
     fListHistos;  //! List of histogram manager lists in the framework classes
 
   Double_t fBeamEnergy = 0.;  // beam energy in GeV (set by hand)
-
+  Int_t fThermalScaling = 0;  
+  
   AnalysisCuts* fEventFilter     = NULL;  // event filter
   PairAnalysisEvent* fInputEvent = NULL;  //! event handler
   Int_t fEventsTotal             = 0;     // total number of processed events
@@ -66,7 +69,8 @@ protected:
 
   TStopwatch fTimer;     //! stopwatch for cpu consumption
   ProcInfo_t fProcInfo;  //! memory usage
-
+  Int_t fId=0;
+  
   AnalysisTaskMultiPairAnalysis(const AnalysisTaskMultiPairAnalysis& c);
   AnalysisTaskMultiPairAnalysis&
   operator=(const AnalysisTaskMultiPairAnalysis& c);

analysis/PWGDIL/dielectron/papaframework/PairAnalysisEvent.h

@@ -30,6 +30,7 @@ public:
   virtual ~PairAnalysisEvent();
 
   void SetInput(FairRootManager* man);
+  void SetANNId(Int_t Id)   { fANNId=Id; }
   void Init();
 
 
@@ -109,7 +110,9 @@ private:
   TObjArray* fTracks;                // papa tracks
 
   Int_t fMultiMatch = 0;  // number of mutiple matched tracks
-
+  Bool_t        fANN=true;
+  Int_t         fANNId=1;
+  
   PairAnalysisEvent(const PairAnalysisEvent& event);
   PairAnalysisEvent& operator=(const PairAnalysisEvent& c);
 

analysis/PWGDIL/dielectron/papaframework/PairAnalysisVarManager.cxx

@@ -46,6 +46,7 @@ ClassImp(PairAnalysisVarManager)
     {"MLA", "m_{#Lambda}", "(GeV/#it{c}^{2})"},
     {"MPair", "m_{pair}", "(GeV/#it{c}^{2})"},
     {"Ebeam", "#it{E}_{beam}", "(#it{A}GeV)"},
+    {"ThermalScaling", "", ""},
     // Hit specific variables
     {"PosX", "x_{hit}", "(cm)"},
     {"PosY", "y_{hit}", "(cm)"},
@@ -163,6 +164,7 @@ ClassImp(PairAnalysisVarManager)
     {"MUCHChi2NDF", "#chi^{2}/^{}N_{df}^{MUCH}", ""},
     // technical information
     {"RndmTrack", "P", ""},
+    {"PRes",                            "",                                                  ""},
 
     // Pair specific variables
     {"Chi2NDF", "#chi^{2}/^{}ndf", ""},
@@ -185,6 +187,20 @@ ClassImp(PairAnalysisVarManager)
     {"PsiPair", "#Psi^{pair}", "(rad.)"},
     {"StsMvdFirstDaughter", "", ""},
     {"StsMvdSecondDaughter", "", ""},
+    {"StsMvdTrdFirstDaughter", "", ""},
+    {"StsMvdTrdSecondDaughter", "", ""},
+    {"StsMvdRichFirstDaughter", "", ""},
+    {"StsMvdRichSecondDaughter", "", ""},
+    {"StsFirstDaughter", "", ""},
+    {"StsSecondDaughter", "", ""},
+    {"MvdFirstDaughter", "", ""},
+    {"MvdSecondDaughter", "", ""},
+    {"TrdFirstDaughter", "", ""},
+    {"TrdSecondDaughter", "", ""},
+    {"RichFirstDaughter", "", ""},
+    {"RichSecondDaughter", "", ""},
+    {"StsHitDist", "", ""},
+    {"MvdHitDist", "", ""},
     {"PhivPair", "#Phi_{v}^{pair}", "(rad.)"},
 
     {"LegDistance", "d^{legs}", "(cm)"},