start of database macro, adjustment of conservate defaults

[u/mrichter/AliRoot.git] / PWG / EMCAL / macros / AddTaskEMCALTenderUsingDatasetDef.C

diff --git a/PWG/EMCAL/macros/AddTaskEMCALTenderUsingDatasetDef.C b/PWG/EMCAL/macros/AddTaskEMCALTenderUsingDatasetDef.C
index 21ff735eebe1a7b25189cc8cce4147d99dbc7eb0..fb86c9e0ca3d061024e30909c3f34b48b21bc462 100644 (file)
--- a/PWG/EMCAL/macros/AddTaskEMCALTenderUsingDatasetDef.C
+++ b/PWG/EMCAL/macros/AddTaskEMCALTenderUsingDatasetDef.C
@@ -1,7 +1,7 @@
 // $Id$
 
 AliAnalysisTaskSE *AddTaskEMCALTenderUsingDatasetDef(
-  const char *dstr    = "LHC11h",
+  const char *perstr  = "LHC11h",
   const char *pass    = 0 /*should not be needed*/
 ) 
 {
@@ -14,24 +14,31 @@ AliAnalysisTaskSE *AddTaskEMCALTenderUsingDatasetDef(
   Bool_t remExotic      = kTRUE;   //remove exotic cells
   Bool_t fidRegion      = kFALSE;  //apply fiducial cuts
   Bool_t calibEnergy    = kTRUE;   //calibrate energy
-  Bool_t calibTime      = kTRUE,   //calibrate timing
-  Bool_t remBC          = kTRUE,   //remove bad channels
+  Bool_t calibTime      = kTRUE;   //calibrate timing
+  Bool_t remBC          = kTRUE;   //remove bad channels
   UInt_t nonLinFunct    = AliEMCALRecoUtils::kBeamTestCorrected;
-  Bool_t reclusterize   = kFALSE,  //reclusterize
-  Float_t seedthresh    = 0.3,     //seed threshold
-  Float_t cellthresh    = 0.05,    //cell threshold
-  UInt_t clusterizer    = AliEMCALRecParam::kClusterizerv2,
-  Bool_t trackMatch     = kFALSE,  //track matching
-  Bool_t updateCellOnly = kFALSE,  //only change if you run your own clusterizer task
-  Float_t timeMin       = 100e-9,  //minimum time of physical signal in a cell/digit (s)
-  Float_t timeMax       = 900e-9,  //maximum time of physical signal in a cell/digit (s)
-  Float_t timeCut       = 50e-9,   //maximum time difference between the digits inside EMC cluster (s)
+  Bool_t reclusterize   = kFALSE;  //reclusterize
+  Float_t seedthresh    = 0.100;   //seed threshold
+  Float_t cellthresh    = 0.050;   //cell threshold
+  UInt_t clusterizer    = AliEMCALRecParam::kClusterizerv2;
+  Bool_t trackMatch     = kTRUE;   //track matching
+  Bool_t updateCellOnly = kFALSE;  //only change if you run your own clusterizer task
+  Float_t timeMin       = 100e-9;  //minimum time of physical signal in a cell/digit (s)
+  Float_t timeMax       = 900e-9;  //maximum time of physical signal in a cell/digit (s)
+  Float_t timeCut       = 900e-9;  //maximum time difference between the digits inside EMC cluster (s)
 
+  TString period(perstr);
+  period.ToLower();
+  if (period == "lhc12a15e")
+    nonLinFunct = AliEMCALRecoUtils::kPi0MCv3;
+  else if (period == "lhc12a15a")
+    nonLinFunct = AliEMCALRecoUtils::kPi0MCv2;
 
-AliAnalysisTaskSE *task = AddTaskEMCALTender(
-  "tothink",distBC,recalibClus,recalcClusPos,nonLinearCorr,remExotic,fidRegion,calibEnergy,calibTime,
-  remBC, nonLinFunct, reclusterize, seedthresh, cellthresh, clusterizer, trackMatch, updateCellOnly,
-  timeMin, timeMax, timeCut, 0);
+  AliAnalysisTaskSE *task = AddTaskEMCALTender(
+    distBC, recalibClus, recalcClusPos, nonLinearCorr,
+    remExotic, fidRegion, calibEnergy, calibTime, remBC, nonLinFunct, 
+    reclusterize, seedthresh, cellthresh, clusterizer, trackMatch, updateCellOnly,
+    timeMin, timeMax, timeCut, pass);
 
-  return et;
+  return task;
 }