]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
updating macros for running on compiled code
authorcnattras <christine.nattrass@cern.ch>
Wed, 19 Mar 2014 13:21:50 +0000 (14:21 +0100)
committercnattras <christine.nattrass@cern.ch>
Wed, 19 Mar 2014 13:22:14 +0000 (14:22 +0100)
PWGLF/totEt/macros/CreateAlienHandlerCaloEtSim.C
PWGLF/totEt/macros/runCaloEt.C

index e542d15f956b1ef31ed89febfa29c7cce20c7c1e..a5f474dde9c97f4af6312d47de978eeca9a2b831 100644 (file)
@@ -1,4 +1,4 @@
-AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputName, const char * pluginRunMode, int production, Bool_t isPHOS, Bool_t ispp,Bool_t isData, Int_t runnum)
+AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputName, const char * pluginRunMode, int production, Bool_t isPHOS, Bool_t ispp,Bool_t isData, Int_t runnum, Bool_t runCompiledVersion)
 {
   // Check if user has a valid token, otherwise make one. This has limitations.
   // One can always follow the standard procedure of calling alien-token-init then
@@ -16,8 +16,8 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
 
   // Set versions of used packages
    plugin->SetAPIVersion("V1.1x");
-   plugin->SetROOTVersion("v5-34-08");
-   plugin->SetAliROOTVersion("v5-05-02-AN");
+   plugin->SetROOTVersion("v5-34-08-4");
+   plugin->SetAliROOTVersion("v5-05-63-AN");
   // Declare input data to be processed.
 
   // Method 1: Create automatically XML collections using alien 'find' command.
@@ -99,7 +99,8 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
         plugin->SetGridDataDir("/alice/data/2011/LHC11h_2");//PbPb data
         plugin->SetDataPattern("*ESDs/pass2/*ESDs.root");
         plugin->SetRunPrefix("000");   // real data
-        plugin->AddRunNumber(169099);
+        //plugin->AddRunNumber(169099);
+        plugin->AddRunNumber(168464);
         outputDir = outputDir + "LHC11hPass2";
        }
     }
@@ -154,6 +155,19 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
        plugin->SetGridDataDir(" /alice/sim/2013/LHC13d2");
        plugin->AddRunNumber(139465);//probably our focus now
       }
+      if(production==5){//2011 production - not perfect but the best fit
+       cout<<"I am here setting grid data dir"<<endl;
+       outputDir = outputDir + "LHC14a6";
+       plugin->SetGridDataDir(" /alice/sim/2014/LHC14a6");
+//       outputDir = outputDir + "LHC11a4_bisTEST";
+//       plugin->SetGridDataDir("/alice/sim/LHC11a4_bis");
+//     plugin->AddRunNumber(139465);
+//     plugin->AddRunNumber(137161);
+//     outputDir = outputDir + "LHC14a1a";
+//     plugin->SetGridDataDir(" /alice/sim/2014/LHC14a1a");
+       plugin->AddRunNumber(168464);//probably our focus now
+       //plugin->AddRunNumber(169238);//test 18 Mar 14 - does this let me submit jobs?
+      }
 
 
     }
@@ -174,12 +188,17 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
   // Declare the analysis source files names separated by blancs. To be compiled runtime IN THE SAME ORDER THEY ARE LISTED
   //plugin->SetAdditionalRootLibs("libPHOSUtils.so libEMCALUtils.so libPWG4CaloCalib.so libPWG4PartCorrBase.so libPWG4PartCorrDep.so");
   // using ACLiC on the worker nodes.
-  plugin->SetAnalysisSource("AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisEtSelector.cxx AliAnalysisEtSelectorPhos.cxx AliAnalysisEtSelectorEmcal.cxx AliAnalysisEtTrackMatchCorrections.cxx AliAnalysisEtRecEffCorrection.cxx AliAnalysisEt.cxx AliAnalysisEtMonteCarlo.cxx AliAnalysisEtMonteCarloPhos.cxx AliAnalysisEtMonteCarloEmcal.cxx AliAnalysisEtReconstructed.cxx AliAnalysisEtReconstructedPhos.cxx AliAnalysisEtReconstructedEmcal.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisEmEtMonteCarlo.cxx AliAnalysisEmEtReconstructed.cxx AliAnalysisTaskTotEt.cxx");
+  if(runCompiledVersion){
+    plugin->SetAdditionalLibs("libPHOSUtils.so libTENDER.so libTENDERSupplies.so libPWGTools.so libPWGEMCAL.so badchannels.root libPWGLFtotEt.so corrections.root calocorrections.root ConfigEtMonteCarlo.C ConfigEtReconstructed.C");
+  }
+  else{
+    plugin->SetAnalysisSource("AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisEtSelector.cxx AliAnalysisEtSelectorPhos.cxx AliAnalysisEtSelectorEmcal.cxx AliAnalysisEtTrackMatchCorrections.cxx AliAnalysisEtRecEffCorrection.cxx AliAnalysisEt.cxx AliAnalysisEtMonteCarlo.cxx AliAnalysisEtMonteCarloPhos.cxx AliAnalysisEtMonteCarloEmcal.cxx AliAnalysisEtReconstructed.cxx AliAnalysisEtReconstructedPhos.cxx AliAnalysisEtReconstructedEmcal.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisEmEtMonteCarlo.cxx AliAnalysisEmEtReconstructed.cxx AliAnalysisTaskTotEt.cxx");
   //plugin->SetAnalysisSource("AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisEtSelector.cxx AliAnalysisEtSelectorPhos.cxx AliAnalysisEt.cxx AliAnalysisEtMonteCarlo.cxx AliAnalysisEtMonteCarloPhos.cxx AliAnalysisEtMonteCarloEmcal.cxx AliAnalysisEtReconstructed.cxx AliAnalysisEtReconstructedPhos.cxx AliAnalysisEtReconstructedEmcal.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisTaskTotEt.cxx");
   // Declare all libraries (other than the default ones for the framework. These will be
   // loaded by the generated analysis macro. Add all extra files (task .cxx/.h) here.
-  plugin->SetAdditionalLibs("libPHOSUtils.so libTENDER.so libTENDERSupplies.so libPWGTools.so libPWGEMCAL.so AliAnalysisEtCuts.cxx AliAnalysisEtCuts.h AliAnalysisHadEtCorrections.cxx AliAnalysisHadEtCorrections.h AliAnalysisEtCommon.cxx AliAnalysisEtCommon.h AliAnalysisEtSelector.cxx AliAnalysisEtSelector.h AliAnalysisEtSelectorPhos.cxx AliAnalysisEtSelectorPhos.h AliAnalysisEtSelectorEmcal.cxx AliAnalysisEtSelectorEmcal.h AliAnalysisEtTrackMatchCorrections.cxx AliAnalysisEtTrackMatchCorrections.h AliAnalysisEtRecEffCorrection.cxx AliAnalysisEtRecEffCorrection.h AliAnalysisEt.cxx AliAnalysisEt.h AliAnalysisEtMonteCarlo.cxx AliAnalysisEtMonteCarlo.h AliAnalysisEtMonteCarloPhos.cxx AliAnalysisEtMonteCarloPhos.h AliAnalysisEtMonteCarloEmcal.cxx AliAnalysisEtMonteCarloEmcal.h AliAnalysisEtReconstructed.cxx AliAnalysisEtReconstructed.h AliAnalysisEtReconstructedPhos.cxx AliAnalysisEtReconstructedPhos.h AliAnalysisEtReconstructedEmcal.cxx AliAnalysisEtReconstructedEmcal.h AliAnalysisTaskTransverseEnergy.cxx AliAnalysisTaskTransverseEnergy.h AliAnalysisEmEtMonteCarlo.cxx AliAnalysisEmEtMonteCarlo.h AliAnalysisEmEtReconstructed.cxx AliAnalysisEmEtReconstructed.h AliAnalysisTaskTotEt.cxx AliAnalysisTaskTotEt.h badchannels.root corrections.root calocorrections.root ConfigEtMonteCarlo.C ConfigEtReconstructed.C");
-  plugin->SetExecutableCommand("aliroot -b -q");
+    plugin->SetAdditionalLibs("libPHOSUtils.so libTENDER.so libTENDERSupplies.so libPWGTools.so libPWGEMCAL.so AliAnalysisEtCuts.cxx AliAnalysisEtCuts.h AliAnalysisHadEtCorrections.cxx AliAnalysisHadEtCorrections.h AliAnalysisEtCommon.cxx AliAnalysisEtCommon.h AliAnalysisEtSelector.cxx AliAnalysisEtSelector.h AliAnalysisEtSelectorPhos.cxx AliAnalysisEtSelectorPhos.h AliAnalysisEtSelectorEmcal.cxx AliAnalysisEtSelectorEmcal.h AliAnalysisEtTrackMatchCorrections.cxx AliAnalysisEtTrackMatchCorrections.h AliAnalysisEtRecEffCorrection.cxx AliAnalysisEtRecEffCorrection.h AliAnalysisEt.cxx AliAnalysisEt.h AliAnalysisEtMonteCarlo.cxx AliAnalysisEtMonteCarlo.h AliAnalysisEtMonteCarloPhos.cxx AliAnalysisEtMonteCarloPhos.h AliAnalysisEtMonteCarloEmcal.cxx AliAnalysisEtMonteCarloEmcal.h AliAnalysisEtReconstructed.cxx AliAnalysisEtReconstructed.h AliAnalysisEtReconstructedPhos.cxx AliAnalysisEtReconstructedPhos.h AliAnalysisEtReconstructedEmcal.cxx AliAnalysisEtReconstructedEmcal.h AliAnalysisTaskTransverseEnergy.cxx AliAnalysisTaskTransverseEnergy.h AliAnalysisEmEtMonteCarlo.cxx AliAnalysisEmEtMonteCarlo.h AliAnalysisEmEtReconstructed.cxx AliAnalysisEmEtReconstructed.h AliAnalysisTaskTotEt.cxx AliAnalysisTaskTotEt.h badchannels.root corrections.root calocorrections.root ConfigEtMonteCarlo.C ConfigEtReconstructed.C");
+  }
+    plugin->SetExecutableCommand("aliroot -b -q");
   // add extra include files/path
   plugin->AddIncludePath("-I. -I$ALICE_ROOT/EMCAL -I$ALICE_ROOT/ANALYSIS");
 
@@ -193,13 +212,13 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
   plugin->SetAnalysisMacro("DavidEtAnalysis.C");
   // Optionally set maximum number of input files/subjob (default 100, put 0 to ignore). The optimum for an analysis
   // is correlated with the run time - count few hours TTL per job, not minutes !
-  plugin->SetSplitMaxInputFileNumber(100);
+  plugin->SetSplitMaxInputFileNumber(20);
   // Optionally set number of failed jobs that will trigger killing waiting sub-jobs.
   //plugin->SetMaxInitFailed(50);
   // Optionally resubmit threshold.
   //plugin->SetMasterResubmitThreshold(90);
   // Optionally set time to live (default 30000 sec)
-  plugin->SetTTL(20000);
+  plugin->SetTTL(30000);
   // Optionally set input format (default xml-single)
   plugin->SetInputFormat("xml-single");
   // Optionally modify the name of the generated JDL (default analysis.jdl)
index ca7a577ddab4d36090678982fcf1cfce46887b00..70f2a001873faaa6d131653486bff40df69bd229 100644 (file)
@@ -9,8 +9,10 @@ void runCaloEt(bool submit = false, // true or false
               //const char *dataType="realPbPb", // "sim" or "real" etc.
               const char *pluginRunMode="test", // "test" or "full" or "terminate"
               const char *det = "EMCal",
-              int production = 1, Bool_t withtender = kTRUE, Int_t runnum = 0, Bool_t withNonlinearity = kTRUE, Bool_t withReclusterizing = kFALSE, Int_t trackmatchcuts=0) // "PHOS" or "EMCAL" or EMCalDetail
+              int production = 1, Bool_t withtender = kTRUE, Int_t runnum = 0, Bool_t withNonlinearity = kTRUE, Bool_t withReclusterizing = kFALSE, Int_t trackmatchcuts=0, Bool_t is2011 = kFALSE) // "PHOS" or "EMCAL" or EMCalDetail
 {
+  bool runCompiledVersion = kTRUE;
+  class AliAnalysisEtCuts;
   TStopwatch timer;
   timer.Start();
   gSystem->Load("libTree");
@@ -30,6 +32,12 @@ void runCaloEt(bool submit = false, // true or false
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
 
+    gSystem->Load("libTENDER.so");
+    gSystem->Load("libTENDERSupplies.so"); 
+    gSystem->Load("libPWGTools.so");
+    gSystem->Load("libPWGEMCAL.so");
+    gROOT->ProcessLine(".include $ALICE_ROOT/Tender/"); 
+    //gSystem->AddIncludePath("-I$ALICE_ROOT/ANALYSIS "); 
 
 
   if (!submit) { 
@@ -39,28 +47,32 @@ void runCaloEt(bool submit = false, // true or false
     cout << "submitting to grid" << endl;
   }
    
-  gROOT->ProcessLine(".L AliAnalysisEtCuts.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisHadEtCorrections.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtCommon.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtSelector.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtSelectorPhos.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtSelectorEmcal.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtTrackMatchCorrections.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtRecEffCorrection.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEt.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtMonteCarlo.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtMonteCarloPhos.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtMonteCarloEmcal.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtReconstructed.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtReconstructedPhos.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEtReconstructedEmcal.cxx+g");  
-  //gROOT->ProcessLine(".L AliAnalysisEtSelectionContainer.cxx+g");
-  //gROOT->ProcessLine(".L AliAnalysisEtSelectionHandler.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisTaskTransverseEnergy.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEmEtMonteCarlo.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisEmEtReconstructed.cxx+g");
-  gROOT->ProcessLine(".L AliAnalysisTaskTotEt.cxx+g");
-
+  if(runCompiledVersion){
+    gSystem->Load("libPWGLFtotEt.so");
+  }
+  else{
+    gROOT->ProcessLine(".L AliAnalysisEtCuts.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisHadEtCorrections.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtCommon.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtSelector.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtSelectorPhos.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtSelectorEmcal.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtTrackMatchCorrections.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtRecEffCorrection.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEt.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtMonteCarlo.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtMonteCarloPhos.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtMonteCarloEmcal.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtReconstructed.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtReconstructedPhos.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEtReconstructedEmcal.cxx+g");  
+    //gROOT->ProcessLine(".L AliAnalysisEtSelectionContainer.cxx+g");
+    //gROOT->ProcessLine(".L AliAnalysisEtSelectionHandler.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisTaskTransverseEnergy.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEmEtMonteCarlo.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisEmEtReconstructed.cxx+g");
+    gROOT->ProcessLine(".L AliAnalysisTaskTotEt.cxx+g");
+  }
   TString detStr(det);
   TString dataStr(dataType);
   if ( detStr.Contains("PHOS") ) {
@@ -74,14 +86,30 @@ void runCaloEt(bool submit = false, // true or false
   }
   else{
     gSystem->CopyFile("calocorrections.EMCAL.root","calocorrections.root",kTRUE);
-    if ( dataStr.Contains("sim") ) {
-      gSystem->CopyFile("ConfigEtMonteCarlo.EMCAL.C","ConfigEtMonteCarlo.C",kTRUE);
-    }
-    else{
-      gSystem->CopyFile("ConfigEtMonteCarlo.EMCAL.data.C","ConfigEtMonteCarlo.C",kTRUE);
-    }
+//     if(is2011){
+//       if ( dataStr.Contains("sim") ) {
+//     gSystem->CopyFile("ConfigEtMonteCarlo.EMCAL.2011.C","ConfigEtMonteCarlo.C",kTRUE);
+//       }
+//       else{
+//     gSystem->CopyFile("ConfigEtMonteCarlo.EMCAL.2011.data.C","ConfigEtMonteCarlo.C",kTRUE);
+//       }
+//     }
+//     else{
+      if ( dataStr.Contains("sim") ) {
+       gSystem->CopyFile("ConfigEtMonteCarlo.EMCAL.C","ConfigEtMonteCarlo.C",kTRUE);
+      }
+      else{
+       gSystem->CopyFile("ConfigEtMonteCarlo.EMCAL.data.C","ConfigEtMonteCarlo.C",kTRUE);
+      }
+//     }
   }
 
+  if(is2011){
+      gSystem->CopyFile("ConfigEtReconstructed.2011.C","ConfigEtReconstructed.C",kTRUE);
+  }
+  else{
+      gSystem->CopyFile("ConfigEtReconstructed.2010.C","ConfigEtReconstructed.C",kTRUE);
+  }
 
   char *kTreeName = "esdTree" ;
   TChain * chain   = new TChain(kTreeName,"myESDTree") ;
@@ -128,7 +156,8 @@ void runCaloEt(bool submit = false, // true or false
   if(!isPb){ cout<<"I am not PbPb!!"<<endl;}
   if (submit) {
     gROOT->LoadMacro("CreateAlienHandlerCaloEtSim.C");
-    AliAnalysisGrid *alienHandler = CreateAlienHandlerCaloEtSim(outputDir, outputName, pluginRunMode, production,detStr.Contains("PHOS"),!isPb,dataStr.Contains("real"),runnum);  
+    cout<<"Passing in production number "<<production<<endl;
+    AliAnalysisGrid *alienHandler = CreateAlienHandlerCaloEtSim(outputDir, outputName, pluginRunMode, production,detStr.Contains("PHOS"),!isPb,dataStr.Contains("real"),runnum,runCompiledVersion);  
     if (!alienHandler) return;
     mgr->SetGridHandler(alienHandler);
   }
@@ -150,14 +179,14 @@ void runCaloEt(bool submit = false, // true or false
 //       chain->Add("/data/LHC10h8/137161/111/AliESDs.root");//Hijing Pb+Pb
 //       chain->Add("/data/LHC10h8/137161/222/AliESDs.root");//Hijing Pb+Pb
 chain->Add("/data/LHC11a10a_bis/139465/001/AliESDs.root");
-  chain->Add("/data/LHC11a10a_bis/139465/002/AliESDs.root");
-  chain->Add("/data/LHC11a10a_bis/139465/003/AliESDs.root");
- chain->Add("/data/LHC11a10a_bis/139465/004/AliESDs.root");
- chain->Add("/data/LHC11a10a_bis/139465/006/AliESDs.root");
- chain->Add("/data/LHC11a10a_bis/139465/007/AliESDs.root");
- chain->Add("/data/LHC11a10a_bis/139465/008/AliESDs.root");
- chain->Add("/data/LHC11a10a_bis/139465/009/AliESDs.root");
- chain->Add("/data/LHC11a10a_bis/139465/010/AliESDs.root");
+//   chain->Add("/data/LHC11a10a_bis/139465/002/AliESDs.root");
+//   chain->Add("/data/LHC11a10a_bis/139465/003/AliESDs.root");
+//  chain->Add("/data/LHC11a10a_bis/139465/004/AliESDs.root");
+//  chain->Add("/data/LHC11a10a_bis/139465/006/AliESDs.root");
+//  chain->Add("/data/LHC11a10a_bis/139465/007/AliESDs.root");
+//  chain->Add("/data/LHC11a10a_bis/139465/008/AliESDs.root");
+//  chain->Add("/data/LHC11a10a_bis/139465/009/AliESDs.root");
+//  chain->Add("/data/LHC11a10a_bis/139465/010/AliESDs.root");
 // chain->Add("/data/LHC11a10a_bis/139465/011/AliESDs.root");
 // chain->Add("/data/LHC11a10a_bis/139465/012/AliESDs.root");
 // chain->Add("/data/LHC11a10a_bis/139465/013/AliESDs.root");
@@ -244,12 +273,6 @@ chain->Add("/data/LHC11a10a_bis/139465/001/AliESDs.root");
     if(detStr.Contains("EMC")){
   //if(0){
     cout<<"You are running over EMCal data and using the tender supply"<<endl;
-    gSystem->Load("libTENDER.so");
-    gSystem->Load("libTENDERSupplies.so"); 
-    gSystem->Load("libPWGTools.so");
-    gSystem->Load("libPWGEMCAL.so");
-    gROOT->ProcessLine(".include $ALICE_ROOT/Tender/"); 
-    gSystem->AddIncludePath("-I$ALICE_ROOT/ANALYSIS "); 
     //this macro is downloaded from the EMCal tender supply twiki 
     //hopefully it will be replaced by something checked in to aliroot
     //I have added the function from GetOCDBRecParam.C in Jiri's example to this so that we don't add gobs of macros to the code
@@ -288,26 +311,28 @@ chain->Add("/data/LHC11a10a_bis/139465/001/AliESDs.root");
 
     gROOT->LoadMacro("$ALICE_ROOT/PWG/EMCAL/macros/AddTaskEMCALTender.C");//tendertasks
     TString runPeriod = "LHC10h";
-    Bool_t distBC         = kTRUE;   //distance to bad channel
-    Bool_t recalibClus    = kTRUE;   //recalibrate cluster energy
-    Bool_t recalcClusPos  = kTRUE;   //recalculate cluster position
-    Bool_t nonLinearCorr  = kTRUE;   //apply non-linearity
-    Bool_t remExotic      = kTRUE;   //remove exotic cells
-    Bool_t fidRegion      = kTRUE;  //apply fiducial cuts
-    Bool_t calibEnergy    = kTRUE;   //calibrate energy
-    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     = 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       = 50e-9;   //maximum time difference between the digits inside EMC cluster (s)
-    AliAnalysisTaskSE *tender = AddTaskEMCALTender(runPeriod.Data(), distBC, recalibClus, recalcClusPos, nonLinearCorr, remExotic, 
+  Bool_t distBC         = kTRUE;   //distance to bad channel
+  Bool_t recalibClus    = kTRUE;   //recalibrate cluster energy
+  Bool_t recalcClusPos  = kTRUE;   //recalculate cluster position
+  Bool_t nonLinearCorr  = kTRUE;   //apply non-linearity
+  Bool_t remExotic      = kTRUE;   //remove exotic cells
+  Bool_t fidRegion      = kTRUE;  //apply fiducial cuts -->  different from defaults
+  Bool_t calibEnergy    = kTRUE;   //calibrate energy
+  Bool_t calibTime      = kTRUE;   //calibrate timing
+  Bool_t remBC          = kTRUE;   //remove bad channels
+  UInt_t nonLinFunct    = AliEMCALRecoUtils::kBeamTestCorrected;
+  Bool_t reclusterize   = kFALSE;   //reclusterize --> different from defaults
+  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)
+    const char *pass      = 0 ;       //string defining pass (use none if figured out from path)
+    //AliAnalysisTaskSE *tender = AddTaskEMCALTender();
+    AliAnalysisTaskSE *tender = AddTaskEMCALTender(distBC, recalibClus, recalcClusPos, nonLinearCorr, remExotic, 
                                                   fidRegion, calibEnergy, calibTime, remBC, nonLinFunct, reclusterize, seedthresh, 
                                                   cellthresh, clusterizer, trackMatch, updateCellOnly, timeMin, timeMax, timeCut);