adding switches to run compiled version

diff --git a/PWGLF/totEt/macros/CreateAlienHandlerHadEt.C b/PWGLF/totEt/macros/CreateAlienHandlerHadEt.C
index 8b6660a1a00c290726b0c6b13ea7dc4f59cac48d..84f25c2a7d86f9cd0543bb629c9ce442d4231d5f 100644 (file)
--- a/PWGLF/totEt/macros/CreateAlienHandlerHadEt.C
+++ b/PWGLF/totEt/macros/CreateAlienHandlerHadEt.C
@@ -1,4 +1,4 @@
-AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test, Int_t material, Bool_t altV0Scale = kFALSE)
+AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test, Int_t material, Bool_t altV0Scale = kFALSE, bool runCompiledVersion = kFALSE)
 {
   // 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
@@ -15,13 +15,15 @@ AliAnalysisGrid* CreateAlienHandlerHadEt(Int_t dataset, Bool_t data, Bool_t test
   else{
     plugin->SetRunMode("full");  // 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-30-06");
-   plugin->SetAliROOTVersion("v5-02-20-AN");
+   plugin->SetROOTVersion("v5-33-02a");
+   plugin->SetAliROOTVersion("v5-03-15-AN");
   // Declare input data to be processed.
 
-plugin->AddIncludePath("-I$ALICE_ROOT/PWGUD/base");
+   plugin->AddIncludePath("-I$ALICE_ROOT/PWGUD/base");
   // Method 1: Create automatically XML collections using alien 'find' command.
   // Define production directory LFN
   //   plugin->SetGridDataDir("/alice/sim/LHC10a18");
@@ -216,7 +218,9 @@ plugin->AddIncludePath("-I$ALICE_ROOT/PWGUD/base");
   //plugin->SetAnalysisSource("AliAnalysisEt.cxx AliAnalysisEtMonteCarlo.cxx AliAnalysisEtMonteCarloPhos.cxx AliAnalysisEtReconstructed.cxx AliAnalysisEtReconstructedPhos.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx AliAnalysisTaskTotEt.cxx");
   //TString sourcefiles = "AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisEtSelectionContainer.cxx AliAnalysisEtSelectionHandler.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisTaskHadEt.cxx";
   //plugin->SetAnalysisSource(sourcefiles.Data());
-  plugin->SetAnalysisSource("AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisEtSelectionContainer.cxx AliAnalysisEtSelectionHandler.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisTaskHadEt.cxx");
+  if(!runCompiledVersion){
+    plugin->SetAnalysisSource("AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisEtSelectionContainer.cxx AliAnalysisEtSelectionHandler.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisTaskHadEt.cxx");
+  }
    
   //cout<<"Setting source files "<<sourcefiles<<endl;
   // Declare all libraries (other than the default ones for the framework. These will be
@@ -224,7 +228,12 @@ plugin->AddIncludePath("-I$ALICE_ROOT/PWGUD/base");
   //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());
-  plugin->SetAdditionalLibs( "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 libPWGUDbase.so");
+  if(!runCompiledVersion){
+    plugin->SetAdditionalLibs( "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 libPWGUDbase.so");
+  }
+  else{
+    plugin->SetAdditionalLibs( "physicsSelections.root ConfigHadEtMonteCarlo.C  ConfigHadEtReconstructed.C corrections.root libPWGUDbase.so libPWGLFtotEt.so");
+  }
   // No need for output file names. Procedure is automatic. <-- not true
   //plugin->SetDefaultOutputs(kFALSE);
   //plugin->SetOutputFiles("Et.ESD.new.sim.root");

diff --git a/PWGLF/totEt/macros/runHadEt.C b/PWGLF/totEt/macros/runHadEt.C
index d888ed49eaea58985b8ec0466fe2bcfc65b91f91..3230c6806d1099d10591757acf724713a615fc73 100644 (file)
--- a/PWGLF/totEt/macros/runHadEt.C
+++ b/PWGLF/totEt/macros/runHadEt.C
@@ -4,12 +4,13 @@
 //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 = 20111, Bool_t test = kFALSE, Int_t material = 0, Bool_t altV0Scale = kFALSE) {
+void runHadEt(bool submit = false, bool data = true, Int_t dataset = 20111, Bool_t test = kTRUE, Int_t material = 0, Bool_t altV0Scale = kFALSE, bool runCompiledVersion = kFALSE) {
     TStopwatch timer;
     timer.Start();
     gSystem->Load("libTree.so");
     gSystem->Load("libGeom.so");
     gSystem->Load("libVMC.so");
+    gSystem->Load("libPhysics.so");
     gSystem->Load("libXMLIO.so");
 
     gSystem->Load("libSTEERBase.so");
@@ -17,22 +18,27 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20111, Boo
     gSystem->Load("libAOD.so");
 
     gSystem->Load("libANALYSIS");
+    gSystem->Load("libOADB.so");
     gSystem->Load("libANALYSISalice");
     gSystem->Load("libPWGUDbase.so");
 
     gSystem->AddIncludePath("-I$ALICE_ROOT/include");
     gSystem->AddIncludePath("-I$ALICE_ROOT/PWGUD/base");
-   gROOT->ProcessLine(".L AliAnalysisEtCuts.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisHadEtCorrections.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisEtCommon.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisHadEt.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisHadEtMonteCarlo.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisHadEtReconstructed.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisEtSelectionContainer.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisEtSelectionHandler.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisTaskTransverseEnergy.cxx+g");
-   gROOT->ProcessLine(".L AliAnalysisTaskHadEt.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 AliAnalysisHadEt.cxx+g");
+      gROOT->ProcessLine(".L AliAnalysisHadEtMonteCarlo.cxx+g");
+      gROOT->ProcessLine(".L AliAnalysisHadEtReconstructed.cxx+g");
+      gROOT->ProcessLine(".L AliAnalysisEtSelectionContainer.cxx+g");
+      gROOT->ProcessLine(".L AliAnalysisEtSelectionHandler.cxx+g");
+      gROOT->ProcessLine(".L AliAnalysisTaskTransverseEnergy.cxx+g");
+      gROOT->ProcessLine(".L AliAnalysisTaskHadEt.cxx+g");
+    }
 
   char *kTreeName = "esdTree" ;
   TChain * chain   = new TChain(kTreeName,"myESDTree") ;
@@ -62,7 +68,9 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20111, Boo
   } 
   else{
     if(data){
-      chain->Add("/data/LHC10dpass2/10000126403050.70/AliESDs.root");//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
     }
     else{
       chain->Add("/data/LHC10d15/1821/AliESDs.root");//simulation p+p
@@ -74,7 +82,7 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20111, Boo
   if(submit){
 
     gROOT->LoadMacro("CreateAlienHandlerHadEt.C");
-    AliAnalysisGrid *alienHandler = CreateAlienHandlerHadEt(dataset,data,test,material,altV0Scale);//integer dataset, boolean isData, bool submit-in-test-mode, bool use alternatve V0 scaling
+    AliAnalysisGrid *alienHandler = CreateAlienHandlerHadEt(dataset,data,test,material,altV0Scale,runCompiledVersion);//integer dataset, boolean isData, bool submit-in-test-mode, bool use alternatve V0 scaling
       if (!alienHandler) return;
       mgr->SetGridHandler(alienHandler);
   }
@@ -87,10 +95,15 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20111, Boo
     mgr->SetMCtruthEventHandler(handler);
   }
 
-  AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer();
 
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
-  if(data) AliPhysicsSelectionTask *physSelTask = AddTaskPhysicsSelection(!data);
+  //if(data)  AliPhysicsSelectionTask *physSelTask = AddTaskPhysicsSelection(!data);
+  AliPhysicsSelectionTask *physSelTask = AddTaskPhysicsSelection(0);
+  if(!physSelTask) { Printf("no physSelTask"); return; }
+  AliPhysicsSelection *physSel = physSelTask->GetPhysicsSelection();
+  physSel->AddCollisionTriggerClass("+CINT1B-ABCE-NOPF-ALL");// #3119 #769");
+
+
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
 
   AliCentralitySelectionTask *centTask;
@@ -136,8 +149,14 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20111, Boo
    }
    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 ) ;}
    mgr->AddTask(task2);
+  AliAnalysisDataContainer *cinput1 = mgr->GetCommonInputContainer();
    AliAnalysisDataContainer *coutput2 = mgr->CreateContainer("out2", TList::Class(), AliAnalysisManager::kOutputContainer,"Et.ESD.new.sim.root");
+//    mgr->ConnectInput(task2,0,cinput1);
+//    mgr->ConnectOutput(task2,1,coutput2);
    mgr->ConnectInput(task2,0,cinput1);
    mgr->ConnectOutput(task2,1,coutput2);