]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Updating macros for running ET code
authorcnattras <christine.nattrass@cern.ch>
Sat, 8 Feb 2014 20:08:26 +0000 (15:08 -0500)
committercnattras <christine.nattrass@cern.ch>
Sat, 8 Feb 2014 20:08:26 +0000 (15:08 -0500)
PWGLF/totEt/macros/CreateAlienHandlerCaloEtSim.C
PWGLF/totEt/macros/CreateAlienHandlerHadEt.C
PWGLF/totEt/macros/runCaloEt.C
PWGLF/totEt/macros/runHadEt.C

index 6567b48149d48a00d84e45dc7d3195c55591853b..e542d15f956b1ef31ed89febfa29c7cce20c7c1e 100644 (file)
@@ -120,7 +120,7 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
        plugin->AddRunNumber(137161);
       }
       if(production==1){
-       cout<<"I am here! Line 93 "<<endl;
+       //cout<<"I am here! Line 93 "<<endl;
        //if(!isPHOS){
          outputDir = outputDir + "LHC11a10a_bis";
          plugin->SetGridDataDir("/alice/sim/LHC11a10a_bis");
@@ -149,6 +149,13 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
        }
        plugin->AddRunNumber(139470);
       }
+      if(production==4){
+       outputDir = outputDir + "LHC13d2";
+       plugin->SetGridDataDir(" /alice/sim/2013/LHC13d2");
+       plugin->AddRunNumber(139465);//probably our focus now
+      }
+
+
     }
    }
 
@@ -171,7 +178,7 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
   //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 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->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");
index fe56560c94d420629de85321fc082541f88f6831..523ff8c9e6bb65550f7befddb177dd693802cfa9 100644 (file)
@@ -1,4 +1,4 @@
-AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test, Int_t material, Bool_t altV0Scale = kFALSE, bool runCompiledVersion = kFALSE)
+AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Int_t test, Int_t material, Bool_t altV0Scale = kFALSE, bool runCompiledVersion = kFALSE, int simflag = 0)
 {
   // 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
@@ -9,21 +9,26 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
   // Overwrite all generated files, datasets and output results from a previous session
   plugin->SetOverwriteMode();
   // Set the run mode (can be "full", "test", "offline", "submit" or "terminate")
-  if(test){
+  if(test==1){
     plugin->SetRunMode("test");  // VERY IMPORTANT - DECRIBED BELOW
   }
   else{
-    plugin->SetRunMode("full");  // VERY IMPORTANT - DECRIBED BELOW
+    if(test==0){
+      plugin->SetRunMode("full");  // VERY IMPORTANT - DECRIBED BELOW
+    }
+    else{
+      plugin->SetRunMode("terminate");  // VERY IMPORTANT - DECRIBED BELOW
+    }
   }
   //needed for local testing?
   //plugin->SetFileForTestMode("files.txt"); // file should contain path name to a local directory containg *ESDs.root etc
   // Set versions of used packages 
    plugin->SetAPIVersion("V1.1x");
-   plugin->SetROOTVersion("v5-33-02a");
-   plugin->SetAliROOTVersion("v5-03-15-AN");
+   plugin->SetROOTVersion("v5-34-08");
+   plugin->SetAliROOTVersion("v5-05-55-AN");
   // Declare input data to be processed.
 
-   plugin->AddIncludePath("-I$ALICE_ROOT/PWGUD/base");
+   plugin->AddIncludePath("-I$ALICE_ROOT/PWGUD/base  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWGPP/ITS");
   // Method 1: Create automatically XML collections using alien 'find' command.
   // Define production directory LFN
   //   plugin->SetGridDataDir("/alice/sim/LHC10a18");
@@ -52,7 +57,8 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
     else{
       cout<<"Running over MC"<<endl;
       if(material==0){
-       plugin->SetGridDataDir("/alice/sim/LHC11a4_bis");//PbPb simulation
+         plugin->SetGridDataDir("/alice/sim/LHC11a10a_bis");
+       //plugin->SetGridDataDir("/alice/sim/LHC11a4_bis");//PbPb simulation
       }
       if(material==1){//7% more material
        plugin->SetGridDataDir("/alice/sim/LHC10h9");//PbPb simulation
@@ -69,64 +75,90 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
       plugin->SetDataPattern("*ESDs.root");
       //plugin->SetGridWorkingDir("etPbPbSim");
     }
-    plugin->AddRunNumber(137366);
-    plugin->AddRunNumber(137161);
+    plugin->AddRunNumber(139465);
+//     plugin->AddRunNumber(137366);
+//     plugin->AddRunNumber(137161);
   }
   else{
     if(dataset==2009){//pp 900 GeV
       if(data){//only 233 jobs!
        cout<<"Running over data"<<endl;
        plugin->SetGridDataDir("/alice/data/2010/LHC10c");//PbPb data
+       //plugin->SetDataPattern("*ESDs/pass3/*ESDs.root");
        plugin->SetDataPattern("*ESDs/pass3/*ESDs.root");
        plugin->SetRunPrefix("000");   // real data
       }
       else{//sim over 1500 jobs, some get killed because it's above quota
        cout<<"Running over MC"<<endl;
-       if(material==0){
-         plugin->SetGridDataDir("/alice/sim/LHC11b1a");//PbPb simulation
-       }
-       if(material==1){//10% more material budget
-         plugin->SetGridDataDir("/alice/sim/LHC11b1b");//PbPb simulation
-       }
-       if(material==-1){//10% less material budget
-         plugin->SetGridDataDir("/alice/sim/LHC11b1c");//PbPb simulation
+       if(simflag==0){
+         if(material==0){
+           plugin->SetGridDataDir("/alice/sim/LHC11b1a");//PbPb simulation
+         }
+         if(material==1){//10% more material budget
+           plugin->SetGridDataDir("/alice/sim/LHC11b1b");//PbPb simulation
+         }
+         if(material==-1){//10% less material budget
+           plugin->SetGridDataDir("/alice/sim/LHC11b1c");//PbPb simulation
+         }
        }
+       if(simflag==1)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h1a");//PYTHIA
+       if(simflag==2)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h1b");//PHOJET
+       if(simflag==3)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h1c");//PYTHIA Flat
        plugin->SetDataPattern("*ESDs.root");
       }
-      plugin->AddRunNumber(121040);
-      plugin->AddRunNumber(121039);
-      plugin->AddRunNumber(118561);
-      plugin->AddRunNumber(118560);
-      plugin->AddRunNumber(118558);
-      plugin->AddRunNumber(118557);
-      plugin->AddRunNumber(118556);
-      plugin->AddRunNumber(118518);
-      plugin->AddRunNumber(118512);
-      plugin->AddRunNumber(118507);
       plugin->AddRunNumber(118506);
-      if(data){
-       plugin->AddRunNumber(118504);
-       plugin->AddRunNumber(118503);
-      }
+//       plugin->AddRunNumber(121040);
+//       plugin->AddRunNumber(121039);
+//       plugin->AddRunNumber(118561);
+//       plugin->AddRunNumber(118560);
+//       plugin->AddRunNumber(118558);
+//       plugin->AddRunNumber(118557);
+//       plugin->AddRunNumber(118556);
+//       plugin->AddRunNumber(118518);
+//       plugin->AddRunNumber(118512);
+//       plugin->AddRunNumber(118507);
+//       plugin->AddRunNumber(118506);
+//if(data){
+//     plugin->AddRunNumber(118504);
+//     plugin->AddRunNumber(118503);
+//    }
     }
   
     if(dataset==20111){//pp 2.76 TeV 
       if(data){//257 jobs
        cout<<"Running over data"<<endl;
        plugin->SetGridDataDir("/alice/data/2011/LHC11a");//
-       plugin->SetDataPattern("*ESDs/pass3_with_SDD/*ESDs.root");
+       plugin->SetDataPattern("*ESDs/pass4_with_SDD/*ESDs.root");
        plugin->SetRunPrefix("000");   // real data
       }
       else{//sim - 332 jobs
        cout<<"Running over MC"<<endl;
-       plugin->SetGridDataDir("/alice/sim/LHC11b10a");//
+       if(simflag==0)  plugin->SetGridDataDir("/alice/sim/LHC11b10a");//
+       if(simflag==1)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h5a");//PYTHIA
+       if(simflag==2)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h5b");//PHOJET
+       if(simflag==3)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h5c");//PYTHIA Flat
        plugin->SetDataPattern("*ESDs.root");
       }
-      plugin->AddRunNumber(146860);
-      plugin->AddRunNumber(146859);
-      plugin->AddRunNumber(146858);
-      plugin->AddRunNumber(146857);
-      plugin->AddRunNumber(146856);
+//       plugin->AddRunNumber(146860);
+//       plugin->AddRunNumber(146859);
+//       plugin->AddRunNumber(146856);
+//       plugin->AddRunNumber(146824);
+//       plugin->AddRunNumber(146817);
+//       plugin->AddRunNumber(146806);
+//       plugin->AddRunNumber(146805);
+//       plugin->AddRunNumber(146804);
+//       plugin->AddRunNumber(146803);
+//       plugin->AddRunNumber(146802);
+//       plugin->AddRunNumber(146801);
+//       plugin->AddRunNumber(146748);
+//       plugin->AddRunNumber(146747);
+//       plugin->AddRunNumber(146746);
+
+  //     plugin->AddRunNumber(146860);
+//       plugin->AddRunNumber(146859);
+//       plugin->AddRunNumber(146858);
+//       plugin->AddRunNumber(146857);
+//       plugin->AddRunNumber(146856);
       //        plugin->AddRunNumber(146824);
       //        if(data){//these productions are not yet done for MC
       //        plugin->AddRunNumber(146817);
@@ -137,6 +169,7 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
       //        plugin->AddRunNumber(146803);
       //        plugin->AddRunNumber(146802);
       //        }
+      plugin->AddRunNumber(146805);
 
     }
     if(dataset==2010){//pp 7 TeV
@@ -148,19 +181,51 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
        plugin->SetRunPrefix("000");   // real data
       }
       else{//sim- 346 jobs
-       plugin->SetGridDataDir("/alice/sim/LHC10e20");
+       if(simflag==0)  plugin->SetGridDataDir("/alice/sim/LHC10e20");//
+       if(simflag==1)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h4a");//PYTHIA
+       if(simflag==2)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h4b");//PHOJET
+       if(simflag==3)  plugin->SetGridDataDir("/alice/sim/2011/LHC11h4c");//PYTHIA Flat
        plugin->SetDataPattern("*ESDs.root");
       }
-       plugin->AddRunNumber("130840");
-       plugin->AddRunNumber("130834");
-       plugin->AddRunNumber("130833");
-       plugin->AddRunNumber("130831");
-       plugin->AddRunNumber("130804");
-       plugin->AddRunNumber("130803");
-       plugin->AddRunNumber("130802");
-       plugin->AddRunNumber("130799");
-       plugin->AddRunNumber("130798");
-       plugin->AddRunNumber("130795");
+      plugin->AddRunNumber("130795");
+//     plugin->AddRunNumber("130840");
+//     plugin->AddRunNumber("130834");
+//     plugin->AddRunNumber("130833");
+//     plugin->AddRunNumber("130831");
+//     plugin->AddRunNumber("130804");
+//     plugin->AddRunNumber("130803");
+//     plugin->AddRunNumber("130802");
+//     plugin->AddRunNumber("130799");
+//     plugin->AddRunNumber("130798");
+//     plugin->AddRunNumber("130795");
+    }
+
+    if(dataset==2012){//pp 8 TeV
+      if(data){//data - 569 jobs
+       cout<<"Running over 8 TeV data"<<endl;
+       plugin->SetGridDataDir("/alice/data/2012/LHC12b");//PbPb data
+       plugin->SetDataPattern("*ESDs/pass1/*ESDs.root");
+       cout<<"Setting run prefix to be 000"<<endl;
+       plugin->SetRunPrefix("000");   // real data
+      }
+      else{//sim- 346 jobs
+       plugin->SetGridDataDir("/alice/sim/2012/LHC12c1b");//
+      }
+      //plugin->AddRunNumber("177799");
+      plugin->AddRunNumber("178030");
+    }
+    if(dataset==2013){//pPb 
+      if(data){//data - 569 jobs
+       cout<<"Running over pPb data"<<endl;
+       plugin->SetGridDataDir("/alice/data/2013/LHC13b");//PbPb data
+       plugin->SetDataPattern("*ESDs/pass3/*ESDs.root");
+       cout<<"Setting run prefix to be 000"<<endl;
+       plugin->SetRunPrefix("000");   // real data
+      }
+      else{//sim- 346 jobs
+       plugin->SetGridDataDir(" /alice/sim/2013/LHC13b3");//
+      }
+      plugin->AddRunNumber("195483");
     }
   }
 
@@ -174,7 +239,7 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
       if(material==-1) plugin->SetGridWorkingDir("etPbPbSimMatBudLow");
       if(material==1) plugin->SetGridWorkingDir("etPbPbSimMatBudHigh");
       if(material==10)  plugin->SetGridWorkingDir("etPbPbSimDPMJET");
-      if(material==11)  plugin->SetGridWorkingDir("etPbPbSimAMPT");
+       if(material==11)  plugin->SetGridWorkingDir("etPbPbSimAMPT");
     }
   }
   else{
@@ -183,9 +248,14 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
        plugin->SetGridWorkingDir("etpp900GeVData");
       }
       else{
-       if(material==0) plugin->SetGridWorkingDir("etpp900GeVSim");
-       if(material==-1) plugin->SetGridWorkingDir("etpp900GeVSimMatBudLow");
-       if(material==1) plugin->SetGridWorkingDir("etpp900GeVSimMatBudHigh");
+       if(simflag==0){
+         if(material==0) plugin->SetGridWorkingDir("etpp900GeVSim");
+         if(material==-1) plugin->SetGridWorkingDir("etpp900GeVSimMatBudLow");
+         if(material==1) plugin->SetGridWorkingDir("etpp900GeVSimMatBudHigh");
+       }
+       if(simflag==1)  plugin->SetGridWorkingDir("etpp900GeVSimPYTHIA");//PYTHIA
+       if(simflag==2)  plugin->SetGridWorkingDir("etpp900GeVSimPHOJET");//PHOJET
+       if(simflag==3)  plugin->SetGridWorkingDir("etpp900GeVSimPYTHIAFLAT");//PYTHIA Flat
       }
     }
     if(dataset==20111){//pp 2.76 TeV
@@ -194,7 +264,14 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
       }
       else{
        if(altV0Scale) plugin->SetGridWorkingDir("etpp276TeVSimAlt");
-       else{plugin->SetGridWorkingDir("etpp276TeVSim");}
+       else{
+         // plugin->SetGridWorkingDir("etpp276TeVSim");
+         
+         if(simflag==0)        plugin->SetGridWorkingDir("etpp276TeVSim");//
+         if(simflag==1)        plugin->SetGridWorkingDir("etpp276TeVSimPYTHIA");//PYTHIA
+         if(simflag==2)        plugin->SetGridWorkingDir("etpp276TeVSimPHOJET");//PHOJET
+         if(simflag==3)        plugin->SetGridWorkingDir("etpp276TeVSimPYTHIAFLAT");//PYTHIA Flat
+       }
       }
     }
     if(dataset==2010){//pp 7 TeV
@@ -202,7 +279,26 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
        plugin->SetGridWorkingDir("etpp7TeVData");
       }
       else{
-       plugin->SetGridWorkingDir("etpp7TeVSim");
+       if(simflag==0)  plugin->SetGridWorkingDir("etpp7TeVSim");//
+       if(simflag==1)  plugin->SetGridWorkingDir("etpp7TeVSimPYTHIA");//PYTHIA
+       if(simflag==2)  plugin->SetGridWorkingDir("etpp7TeVSimPHOJET");//PHOJET
+       if(simflag==3)  plugin->SetGridWorkingDir("etpp7TeVSimPYTHIAFLAT");//PYTHIA Flat
+      }
+    }
+    if(dataset==2012){//pp 8 TeV
+      if(data){
+       plugin->SetGridWorkingDir("etpp8TeVData");
+      }
+      else{
+       plugin->SetGridWorkingDir("etpp8TeVSim");
+      }
+    }
+    if(dataset==2013){//pPb
+      if(data){
+       plugin->SetGridWorkingDir("etpPb5TeVData");
+      }
+      else{
+       plugin->SetGridWorkingDir("etpPb5TeVSim");
       }
     }
   }
@@ -228,8 +324,8 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
   //TString additionallibs = "AliAnalysisEtCuts.h AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.h AliAnalysisHadEtCorrections.cxx  AliAnalysisEtSelectionContainer.cxx AliAnalysisEtSelectionHandler.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisEtCommon.h AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx AliAnalysisHadEt.h AliAnalysisHadEtMonteCarlo.h AliAnalysisHadEtReconstructed.h AliAnalysisTaskHadEt.h  AliAnalysisEtSelectionContainer.h AliAnalysisEtSelectionHandler.h AliAnalysisTaskTransverseEnergy.h corrections.root ConfigHadEtAnalysis.C ConfigHadEtMonteCarlo.C ConfigHadEtReconstructed.C physicsSelections.root";
   //TString additionallibs = "AliAnalysisEtCuts.h AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.h AliAnalysisHadEtCorrections.cxx  AliAnalysisEtSelectionContainer.cxx AliAnalysisEtSelectionHandler.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisEtCommon.h AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx AliAnalysisHadEt.h AliAnalysisHadEtMonteCarlo.h AliAnalysisHadEtReconstructed.h AliAnalysisTaskHadEt.h  AliAnalysisEtSelectionContainer.h AliAnalysisEtSelectionHandler.h AliAnalysisTaskTransverseEnergy.h physicsSelections.root ConfigHadEtMonteCarlo.C  ConfigHadEtReconstructed.C corrections.root";
   //plugin->SetAdditionalLibs(additionallibs.Data());
-  if(!runCompiledVersion){
-    plugin->SetAdditionalLibs( "AliAnalysisEtCuts.h AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.h AliAnalysisHadEtCorrections.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisEtCommon.h AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx AliAnalysisHadEt.h AliAnalysisHadEtMonteCarlo.h AliAnalysisHadEtReconstructed.h AliAnalysisTaskHadEt.h AliAnalysisTaskTransverseEnergy.h ConfigHadEtMonteCarlo.C  ConfigHadEtReconstructed.C corrections.root libPWGUDbase.so");
+  if(!runCompiledVersion){//
+    plugin->SetAdditionalLibs( "libPWGUDbase.so AliAnalysisEtCuts.h AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.h AliAnalysisHadEtCorrections.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisEtCommon.h AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx AliAnalysisHadEt.h AliAnalysisHadEtMonteCarlo.h AliAnalysisHadEtReconstructed.h AliAnalysisTaskHadEt.h AliAnalysisTaskTransverseEnergy.h ConfigHadEtMonteCarlo.C  ConfigHadEtReconstructed.C corrections.root");
   }
   else{
     plugin->SetAdditionalLibs( "ConfigHadEtMonteCarlo.C  ConfigHadEtReconstructed.C corrections.root libPWGUDbase.so libPWGLFtotEt.so");
@@ -243,7 +339,10 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
   plugin->SetAnalysisMacro("ChristinesEtAnalysis.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(50);
+  if(dataset==2013){//pPb 
+    plugin->SetSplitMaxInputFileNumber(20);
+    }
   // Optionally set number of failed jobs that will trigger killing waiting sub-jobs.
   //plugin->SetMaxInitFailed(5);
   // Optionally resubmit threshold.
@@ -260,5 +359,6 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
   plugin->SetSplitMode("se");
   plugin->SetTerminateFiles("event_stat.root") ;
   plugin->SetKeepLogs();
+  plugin->SetMergeViaJDL();
   return plugin;
 } 
index 71eb773e42759daf273895a2f01761e0ac8f6ea9..ca7a577ddab4d36090678982fcf1cfce46887b00 100644 (file)
@@ -6,8 +6,10 @@
 //As written this requires an xml script tag.xml in the ~/et directory on the grid to submit jobs
 void runCaloEt(bool submit = false, // true or false 
               const char *dataType="simPbPb", // "sim" or "real" etc.
+              //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
+              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
 {
   TStopwatch timer;
   timer.Start();
@@ -142,18 +144,20 @@ void runCaloEt(bool submit = false, // true or false
       TString fileLocation = "/data/LHC10h8/137161/999/AliESDs.root";//"/home/dsilverm/data/E_T/" + dataStr + "/dir/AliESDs.root";
       cout << "fileLocation " << fileLocation.Data() << endl; 
 //       chain->Add(fileLocation.Data()); // link to local test file
+//      chain->Add("/data/tmp/3682/AliESDs.root");
+//      chain->Add("/data/tmp/2782/AliESDs.root");
 //       chain->Add("/data/LHC10h8/137161/999/AliESDs.root");//Hijing Pb+Pb
 //       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");
@@ -222,11 +226,14 @@ chain->Add("/data/LHC11a10a_bis/139465/002/AliESDs.root");
   else { // real data
     cout<<"Hello there!  I am data."<<endl;
     isMc = kFALSE;
-      chain->Add("/data/LHC10h/pass2_rev15/10000137366041.860/AliESDs.root");
-      chain->Add("/data/LHC10h/pass2_rev15/10000137366041.870/AliESDs.root");
-      chain->Add("/data/LHC10h/pass2_rev15/10000137366041.880/AliESDs.root");
-      chain->Add("/data/LHC10h/pass2_rev15/10000137366041.890/AliESDs.root");
-      chain->Add("/data/LHC10h/pass2_rev15/10000137366041.900/AliESDs.root");
+
+    //      chain->Add("/data/tmp/10000139465010.600/AliESDs.root");
+
+   chain->Add("/data/LHC10h/pass2_rev15/10000137366041.860/AliESDs.root");
+//       chain->Add("/data/LHC10h/pass2_rev15/10000137366041.870/AliESDs.root");
+//       chain->Add("/data/LHC10h/pass2_rev15/10000137366041.880/AliESDs.root");
+//       chain->Add("/data/LHC10h/pass2_rev15/10000137366041.890/AliESDs.root");
+//       chain->Add("/data/LHC10h/pass2_rev15/10000137366041.900/AliESDs.root");
 //     chain->Add("/data/LHC10dpass2/10000126403050.70/AliESDs.root");//data
     //chain->Add("/home/dsilverm/data/E_T/data/2010/LHC10b/000117222/ESDs/pass2/10000117222021.30/AliESDs.root"); // link to local test file
     cout << " not MC " << endl;
@@ -234,38 +241,78 @@ chain->Add("/data/LHC11a10a_bis/139465/002/AliESDs.root");
 
 
   //if(!isMc && detStr.Contains("EMC")){
-  if(detStr.Contains("EMC")){
+    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
     //I set the defaults to the golden run for PbPb because we are focusing on the golden run, however, this should be thought through!!
-    gROOT->LoadMacro("AddTaskEMCALTenderForEtAnalysis.C");
-    cout<<"WARNING: YOU ARE USING CALIBRATION FACTORS FROM PbPb RUN 137161!!"<<endl;
-//     // get reco params from grid OCDB
-//    gROOT->LoadMacro("./GetOCDBRecParam.C");
-//     // run num, data type pp/PbPb, from grid
-//Gets calibration factors from grid if jobs are to be submitted to the grid
-//     AliEMCALRecParam* pars = GetOCDBRecParam( 137161, "PbPb", submit);
-
-    AliTender *tender = AddTaskEMCALTender( "EMCAL_COMPLETEV1", 0,withNonlinearity,withReclusterizing,trackmatchcuts);
-    //this also likely needs modification
-//     tender->SelectCollisionCandidates( AliVEvent::kMB | AliVEvent::kEMCEGA | AliVEvent::kEMC1 | AliVEvent::kEMC7 );
-//     if(submit){tender->SetDefaultCDBStorage("raw://");} //uncomment if you work on grid
-//     else{tender->SetDefaultCDBStorage("local://$ALICE_ROOT/OCDB");} //uncomment if you work local
-
-    if(submit){
-      cout<<"Setting tender to run on grid"<<endl;
-      tender->SetDefaultCDBStorage("raw://"); //uncomment if you work on grid
-    }
-    else{
-      cout<<"Setting tender to run locally"<<endl;
-      tender->SetDefaultCDBStorage("local://$ALICE_ROOT/OCDB"); //uncomment if you work local
-    }
+    //AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance(geoname);
+
+    gROOT->LoadMacro("$ALICE_ROOT/PWG/EMCAL/macros/AddTaskEmcalSetup.C");
+    AliEmcalSetupTask *setupTask = AddTaskEmcalSetup();
+    setupTask->SetGeoPath("$ALICE_ROOT/OADB/EMCAL");
+    setupTask->SetOcdbPath(""); 
+
+//     gROOT->LoadMacro("AddTaskEMCALTenderForEtAnalysis.C");
+//     //cout<<"WARNING: YOU ARE USING CALIBRATION FACTORS FROM PbPb RUN 137161!!"<<endl;
+// //          // get reco params from grid OCDB
+// //    gROOT->LoadMacro("./GetOCDBRecParam.C");
+// //          // run num, data type pp/PbPb, from grid
+// //Gets calibration factors from grid if jobs are to be submitted to the grid
+// //          AliEMCALRecParam* pars = GetOCDBRecParam( 137161, "PbPb", submit);
+// //EMCAL_FIRSTYEARV1 F-
+//     //AliTender *tender = AddTaskEMCALTender( "EMCAL_COMPLETEV1", 0,withNonlinearity,withReclusterizing,trackmatchcuts);
+// AliTender *tender = AddTaskEMCALTender( "EMCAL_FIRSTYEARV1", 0,withNonlinearity,withReclusterizing,trackmatchcuts);
+//     //this also likely needs modification
+// //     tender->SelectCollisionCandidates( AliVEvent::kMB | AliVEvent::kEMCEGA | AliVEvent::kEMC1 | AliVEvent::kEMC7 );
+// //     if(submit){tender->SetDefaultCDBStorage("raw://");} //uncomment if you work on grid
+// //     else{tender->SetDefaultCDBStorage("local://$ALICE_ROOT/OCDB");} //uncomment if you work local
+
+//     if(submit){
+//       cout<<"Setting tender to run on grid"<<endl;
+//       tender->SetDefaultCDBStorage("raw://"); //uncomment if you work on grid
+//     }
+//     else{
+//       cout<<"Setting tender to run locally"<<endl;
+//       tender->SetDefaultCDBStorage("local://$ALICE_ROOT/OCDB"); //uncomment if you work local
+//     }
+
+
+    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, 
+                                                  fidRegion, calibEnergy, calibTime, remBC, nonLinFunct, reclusterize, seedthresh, 
+                                                  cellthresh, clusterizer, trackMatch, updateCellOnly, timeMin, timeMax, timeCut);
+    
+
+
     // one can sellect what collision candidates to use
     // triggered sample only: L1 = AliVEvent::kEMCEGA, AliVEvent::kEMCEJE; L0 = AliVEvent::kEMC1, AliVEvent::kEMC7
     tender->SelectCollisionCandidates( AliVEvent::kAny );
@@ -300,8 +347,8 @@ chain->Add("/data/LHC11a10a_bis/139465/002/AliESDs.root");
 //                                     Bool_t cachePID=kFALSE, TString detResponse="",
 //                                     Bool_t useTPCEtaCorrection = kFALSE);
   AliAnalysisTaskPIDResponse *taskPID=AddTaskPIDResponse(isMc,kTRUE,kTRUE,2);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDqa.C");
-  AddTaskPIDqa();
+  //gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDqa.C");
+  //AddTaskPIDqa();
 
   AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer();
 
index 16594469c3332afb37948fa2a19ccf277bbfb823..795c291cf3b9425678093eade0432dbb453aa798 100644 (file)
@@ -4,7 +4,7 @@
 //by default this runs locally
 //With the argument true this submits jobs to the grid
 //As written this requires an xml script tag.xml in the ~/et directory on the grid to submit jobs
-void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Bool_t test = kFALSE, Int_t material = 0, Bool_t altV0Scale = kFALSE, bool runCompiledVersion = kFALSE, int simflag = 0) {
+void runHadEt(bool submit = false, bool data = false, Int_t dataset = 2013, Int_t test = 1, Int_t material = 0, Bool_t altV0Scale = kFALSE, bool runCompiledVersion = kFALSE, int simflag = 0) {
     TStopwatch timer;
     timer.Start();
     gSystem->Load("libTree.so");
@@ -65,16 +65,28 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Boo
     }
   } 
   else{
-    if(data){
-      cout<<"Yes I am analyzing the correct file"<<endl;
-      //chain->Add("/data/LHC10dpass2/10000126403050.70/AliESDs.root");//data
-      //chain->Add("/data/LHC11a/11000146856042.90/AliESDs.root");//data pp 2.76 TeV w/SDD pass 2
-      chain->Add("/data/LHC11a/11000146860043.90/AliESDs.root");//data pp 2.76 TeV w/SDD pass 3
-    }
-    else{
-      //chain->Add("/data/LHC10d15/1821/AliESDs.root");//simulation p+p
-      chain->Add("/data/LHC11b10a/001/AliESDs.root");
-    }
+     if(dataset==2013){//pPb 5 TeV
+       if(data){
+        chain->Add("/data/LHC13b/13000195483082.95/AliESDs.root");
+       }
+       else{
+        chain->Add("/data/LHC12c1b/111/AliESDs.root");
+       }
+     }
+     else{
+       if(data){
+        cout<<"Yes I am analyzing the correct file"<<endl;
+        //chain->Add("/data/LHC10dpass2/10000126403050.70/AliESDs.root");//data
+        //chain->Add("/data/LHC11a/11000146856042.90/AliESDs.root");//data pp 2.76 TeV w/SDD pass 2
+        //chain->Add("/data/LHC11a/11000146860043.90/AliESDs.root");//data pp 2.76 TeV w/SDD pass 3
+        chain->Add("/data/LHC10c/10000120683048.90/AliESDs.root");//Data Pb+Pb
+       }
+       else{
+        cerr<<"Hello I am here 75"<<endl;
+        //chain->Add("/data/LHC10d15/1821/AliESDs.root");//simulation p+p
+        chain->Add("/data/LHC11b10a/001/AliESDs.root");
+       }
+     }
   }
 
   // Make the analysis manager
@@ -87,6 +99,7 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Boo
       mgr->SetGridHandler(alienHandler);
   }
 
+  cerr<<"Hello I am here 91"<<endl;
   AliVEventHandler* esdH = new AliESDInputHandler;
   mgr->SetInputEventHandler(esdH);
   AliMCEventHandler* handler = new AliMCEventHandler;
@@ -103,6 +116,7 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Boo
   //physSel->AddCollisionTriggerClass("+CINT1B-ABCE-NOPF-ALL");// #3119 #769");
   //physSelTask->AddCollisionTriggerClass("kMB");// #3119 #769");
 
+  cerr<<"Hello I am here 108"<<endl;
 
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
 
@@ -118,12 +132,13 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Boo
      cout<<"Setting up centrality for data"<<endl;
    }
   }
-
+  Int_t pass = 2;
    if(dataset==20100){//PbPb 2.76 TeV
-     if(data){gSystem->CopyFile("rootFiles/corrections/corrections.LHC11a4_bis.PbPb.ForData.root","corrections.root",kTRUE);}
-     else{gSystem->CopyFile("rootFiles/corrections/corrections.LHC11a4_bis.PbPb.ForSimulations.root","corrections.root",kTRUE);}
+     if(data){gSystem->CopyFile("rootFiles/corrections/corrections.LHC11a10a_bis.PbPb.ForData.root","corrections.root",kTRUE);}
+     else{gSystem->CopyFile("rootFiles/corrections/corrections.LHC11a10a_bis.PbPb.ForSimulations.root","corrections.root",kTRUE);}
      gSystem->CopyFile("ConfigHadEtMonteCarloPbPb.C","ConfigHadEtMonteCarlo.C",kTRUE);
      gSystem->CopyFile("ConfigHadEtReconstructedPbPb.C","ConfigHadEtReconstructed.C",kTRUE);
+     pass = 2;
      //centTask->SetPass(1);
    }
    else{
@@ -132,6 +147,7 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Boo
        gSystem->CopyFile("ConfigHadEtReconstructedpp900GeV.C","ConfigHadEtReconstructed.C",kTRUE);
        if(data){gSystem->CopyFile("rootFiles/corrections/corrections.LHC11b1a.pp.ForData.root","corrections.root",kTRUE);}
        else{gSystem->CopyFile("rootFiles/corrections/corrections.LHC11b1a.pp.ForSimulations.root","corrections.root",kTRUE);}
+       pass = 3;
      }
      if(dataset==20111){//pp 2.76 TeV
        if(altV0Scale)gSystem->CopyFile("ConfigHadEtMonteCarlopp276TeVAlt.C","ConfigHadEtMonteCarlo.C",kTRUE);
@@ -139,31 +155,51 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Boo
        gSystem->CopyFile("ConfigHadEtReconstructedpp276TeV.C","ConfigHadEtReconstructed.C",kTRUE);
        if(data){gSystem->CopyFile("rootFiles/corrections/corrections.LHC11b10a.pp.ForData.root","corrections.root",kTRUE);}
        else{gSystem->CopyFile("rootFiles/corrections/corrections.LHC11b10a.pp.ForSimulations.root","corrections.root",kTRUE);}
+       pass = 4;
      }
      if(dataset==2010){//pp 7 TeV
        gSystem->CopyFile("ConfigHadEtMonteCarlopp7TeV.C","ConfigHadEtMonteCarlo.C",kTRUE);
        gSystem->CopyFile("ConfigHadEtReconstructedpp7TeV.C","ConfigHadEtReconstructed.C",kTRUE);
        if(data){gSystem->CopyFile("rootFiles/corrections/corrections.LHC10e20.pp.ForData.root","corrections.root",kTRUE);}
        else{gSystem->CopyFile("rootFiles/corrections/corrections.LHC10e20.pp.ForSimulations.root","corrections.root",kTRUE);}
+       pass = 2;
+     }
+     if(dataset==2012){//pp 8 TeV
+       gSystem->CopyFile("ConfigHadEtMonteCarlopp8TeV.C","ConfigHadEtMonteCarlo.C",kTRUE);
+       gSystem->CopyFile("ConfigHadEtReconstructedpp8TeV.C","ConfigHadEtReconstructed.C",kTRUE);
+       if(data){gSystem->CopyFile("rootFiles/corrections/corrections.LHC12c1b.pp.ForData.root","corrections.root",kTRUE);}
+       else{gSystem->CopyFile("rootFiles/corrections/corrections.LHC12c1b.pp.ForSimulations.root","corrections.root",kTRUE);}
+       pass = 1;
+     }
+     if(dataset==2013){//pPb 5 TeV
+       gSystem->CopyFile("ConfigHadEtMonteCarlopPb5TeV.C","ConfigHadEtMonteCarlo.C",kTRUE);
+       gSystem->CopyFile("ConfigHadEtReconstructedpPb5TeV.C","ConfigHadEtReconstructed.C",kTRUE);
+       if(data){gSystem->CopyFile("rootFiles/corrections/corrections.LHC13b3.pPb.ForData.root","corrections.root",kTRUE);}
+       else{gSystem->CopyFile("rootFiles/corrections/corrections.LHC13b3.pPb.ForSimulations.root","corrections.root",kTRUE);}
+       pass = 3;
      }
    }
-
-
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C");
-  cout<<"I am adding PID response task"<<endl;
+   
+   
+   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C");
+  cerr<<"I am adding PID response task 169"<<endl;
   //AliAnalysisTask *AddTaskPIDResponse(Bool_t isMC=kFALSE, Bool_t autoMCesd=kTRUE,
 //                                     Bool_t tuneOnData=kFALSE, Int_t recoPass=2,
 //                                     Bool_t cachePID=kFALSE, TString detResponse="",
 //                                     Bool_t useTPCEtaCorrection = kFALSE);
-  AliAnalysisTaskPIDResponse *taskPID=AddTaskPIDResponse(!data,kTRUE,kTRUE,2);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDqa.C");
-  AddTaskPIDqa();
+  AliAnalysisTaskPIDResponse *taskPID=AddTaskPIDResponse(!data,kTRUE,kTRUE,pass);
+  //gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDqa.C");
+  //AddTaskPIDqa();
 
    AliAnalysisTaskHadEt *task2 = new AliAnalysisTaskHadEt("TaskHadEt",!data);//,recoFile,mcFile);
    if(!data) task2->SetMcData();
    //Add thing here to select collision type!!
-   if(dataset!=20100){task2->SelectCollisionCandidates(AliVEvent::kMB ) ;}
-   if(dataset!=20100){task2->SelectCollisionCandidates(AliVEvent::kMB ) ;}
+     if(dataset==2013){//pPb 5 TeV
+       //task2->SelectCollisionCandidates(AliVEvent::kAnyINT ) ;
+       task2->SelectCollisionCandidates(AliVEvent::kINT7 ) ;
+     }
+     else{   if(dataset!=20100){task2->SelectCollisionCandidates(AliVEvent::kMB ) ;}}
+   //if(dataset!=20100){task2->SelectCollisionCandidates(AliVEvent::kMB ) ;}
    mgr->AddTask(task2);
   AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer();
    AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("out2", TList::Class(), AliAnalysisManager::kOutputContainer,"Et.ESD.new.sim.root");