Adding some histograms for PID systematic error, adding some of the configurations...

diff --git a/PWG4/totEt/AliAnalysisHadEtMonteCarlo.cxx b/PWG4/totEt/AliAnalysisHadEtMonteCarlo.cxx
index 0038f6588991f07ff04d506675d5675ee6085541..afb6dc40abab5f7a641c92ff3a270fa3d17e0a1e 100644 (file)
--- a/PWG4/totEt/AliAnalysisHadEtMonteCarlo.cxx
+++ b/PWG4/totEt/AliAnalysisHadEtMonteCarlo.cxx
@@ -209,18 +209,22 @@ Int_t AliAnalysisHadEtMonteCarlo::AnalyseEvent(AliVEvent* ev,AliVEvent* ev2)
                    FillHisto2D(Form("EtNReconstructed%sUnidentified",cutName->Data()),track->Pt(),track->Eta(),1.0);
                    if(pdgCode == fgPiPlusCode||pdgCode == fgPiMinusCode){
                      FillHisto2D(Form("EtReconstructed%sUnidentifiedPionAssumingPion",cutName->Data()),track->Pt(),track->Eta(),myEtPi);
+                     FillHisto2D(Form("EtReconstructed%sUnidentifiedPion",cutName->Data()),track->Pt(),track->Eta(),myEt);
                      FillHisto2D(Form("EtNReconstructed%sUnidentifiedPion",cutName->Data()),track->Pt(),track->Eta(),1.0);
                    }
                    if(pdgCode == fgKPlusCode||pdgCode == fgKMinusCode){
                      FillHisto2D(Form("EtReconstructed%sUnidentifiedKaonAssumingPion",cutName->Data()),track->Pt(),track->Eta(),myEtPi);
+                     FillHisto2D(Form("EtReconstructed%sUnidentifiedKaon",cutName->Data()),track->Pt(),track->Eta(),myEt);
                      FillHisto2D(Form("EtNReconstructed%sUnidentifiedKaon",cutName->Data()),track->Pt(),track->Eta(),1.0);
                    }
                    if(pdgCode == fgProtonCode||pdgCode == fgAntiProtonCode){
                      FillHisto2D(Form("EtReconstructed%sUnidentifiedProtonAssumingPion",cutName->Data()),track->Pt(),track->Eta(),myEtPi);
+                     FillHisto2D(Form("EtReconstructed%sUnidentifiedProton",cutName->Data()),track->Pt(),track->Eta(),myEt);
                      FillHisto2D(Form("EtNReconstructed%sUnidentifiedProton",cutName->Data()),track->Pt(),track->Eta(),1.0);
                      if(fBaryonEnhancement){
                        myEt = myEt*ProtonBaryonEnhancement(track->Pt());
                        FillHisto2D(Form("EtReconstructed%sUnidentifiedProtonAssumingPionEnhanced",cutName->Data()),track->Pt(),track->Eta(),myEtPi);
+                       FillHisto2D(Form("EtReconstructed%sUnidentifiedProtonEnhanced",cutName->Data()),track->Pt(),track->Eta(),myEt);
                        FillHisto2D(Form("EtNReconstructed%sUnidentifiedProtonEnhanced",cutName->Data()),track->Pt(),track->Eta(),1.0);
                      }
                    }
@@ -1123,14 +1127,18 @@ void AliAnalysisHadEtMonteCarlo::CreateHistograms(){
 
     CreateEtaPtHisto2D(Form("EtNReconstructed%sUnidentifiedKaon",cutName->Data()),"Number of Reconstructed unidentified kaons particles");
     CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedKaonAssumingPion",cutName->Data()),"Reconstructed E_{T} from unidentified kaons particles assuming pion mass");
+    CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedKaon",cutName->Data()),"Reconstructed E_{T} from unidentified kaons particles assuming kaon mass");
     CreateEtaPtHisto2D(Form("EtNReconstructed%sUnidentifiedProton",cutName->Data()),"Number of Reconstructed unidentified proton particles");
     CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedProtonAssumingPion",cutName->Data()),"Reconstructed E_{T} from unidentified proton particles assuming pion mass");
+    CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedProton",cutName->Data()),"Reconstructed E_{T} from unidentified proton particles assuming proton mass");
     if(fBaryonEnhancement){
       CreateEtaPtHisto2D(Form("EtNReconstructed%sUnidentifiedProtonEnhanced",cutName->Data()),"Number of Reconstructed unidentified proton particles");
       CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedProtonAssumingPionEnhanced",cutName->Data()),"Reconstructed E_{T} from unidentified proton particles assuming pion mass");
+      CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedProtonEnhanced",cutName->Data()),"Reconstructed E_{T} from unidentified proton particles assuming proton mass");
     }
     CreateEtaPtHisto2D(Form("EtNReconstructed%sUnidentifiedPion",cutName->Data()),"Number of Reconstructed unidentified pions particles");
     CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedPionAssumingPion",cutName->Data()),"Reconstructed E_{T} from unidentified pions particles assuming pion mass");
+    CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentifiedPion",cutName->Data()),"Reconstructed E_{T} from unidentified pions particles assuming pion mass");
 
     CreateEtaPtHisto2D(Form("EtReconstructed%sUnidentified",cutName->Data()),"Reconstructed E_{T} from unidentified particles using real mass");
     CreateEtaPtHisto2D(Form("EtReconstructed%sMisidentifiedElectrons",cutName->Data()),"Reconstructed E_{T} from misidentified electrons");

diff --git a/PWG4/totEt/macros/CreateAlienHandlerHadEtSim.C b/PWG4/totEt/macros/CreateAlienHandlerHadEtSim.C
index f2ab9fdfbf57a4a79ba5c36bbdd539c1656938d1..2493485ff3aa1b142ac885a7c97b1c0facca136c 100644 (file)
--- a/PWG4/totEt/macros/CreateAlienHandlerHadEtSim.C
+++ b/PWG4/totEt/macros/CreateAlienHandlerHadEtSim.C
@@ -8,29 +8,26 @@
 
 // Overwrite all generated files, datasets and output results from a previous session
    plugin->SetOverwriteMode();
-// Set the run modSoon a picture of Kim Jong-un (sitting far left) flashed around the world, the first known image of him since his school dayse (can be "full", "test", "offline", "submit" or "terminate")
+// Set the run mode (can be "full", "test", "offline", "submit" or "terminate")
+   //plugin->SetRunMode("full");  // VERY IMPORTANT - DECRIBED BELOW
    plugin->SetRunMode("full");  // VERY IMPORTANT - DECRIBED BELOW
-   //plugin->SetRunMode("test");  // VERY IMPORTANT - DECRIBED BELOW
-   //plugin->SetCheckCopy(kFALSE);
-// Set versions of used packages
+// Set versions of used packages 
    plugin->SetAPIVersion("V1.1x");
-   plugin->SetROOTVersion("v5-27-06-1");
-   plugin->SetAliROOTVersion("v4-20-12-AN");
+   plugin->SetROOTVersion("v5-27-05");
+   plugin->SetAliROOTVersion("v4-20-08-AN");
 // Declare input data to be processed.
 
 // Method 1: Create automatically XML collections using alien 'find' command.
 // Define production directory LFN
-//   plugin->SetGridDataDir("/alice/data/2010/LHC10d");
+//   plugin->SetGridDataDir("/alice/sim/LHC10a18");
 // Set data search pattern
 //   plugin->SetDataPattern("*ESDs.root");  // simulated, tags not used
-//   plugin->SetDataPattern("*ESDs/pass2/*ESDs.root"); // real data check reco pass and data base directory
+//   plugin->SetDataPattern("*ESDs/pass4/*ESDs.root"); // real data check reco pass and data base directory
 //   plugin->SetRunPrefix("000");   // real data
 //   plugin->SetDataPattern("*tag.root");  // Use ESD tags (same applies for AOD's)
 // ...then add run numbers to be considered
 //   plugin->AddRunNumber(125020);    // simulated
-//   plugin->AddRunNumber(126403);  // real data
-//   plugin->AddRunNumber(126404);  // real data
-//   plugin->AddRunNumber(126405);  // real data
+//   plugin->AddRunNumber(104065);  // real data
 
 // Method 2: Declare existing data files (raw collections, xml collections, root file)
 // If no path mentioned data is supposed to be in the work directory (see SetGridWorkingDir())
@@ -47,10 +44,10 @@
 // using ACLiC on the worker nodes.
    //plugin->SetAnalysisSource("AliAnalysisTaskHadEt.cxx");
    //plugin->SetAnalysisSource("AliAnalysisEt.cxx AliAnalysisEtMonteCarlo.cxx AliAnalysisEtMonteCarloPhos.cxx AliAnalysisEtReconstructed.cxx AliAnalysisEtReconstructedPhos.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx AliAnalysisTaskTotEt.cxx");
-   plugin->SetAnalysisSource("AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx");
+   plugin->SetAnalysisSource("AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisEtSelectionContainer.cxx AliAnalysisEtSelectionHandler.cxx AliAnalysisTaskTransverseEnergy.cxx AliAnalysisTaskHadEt.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("AliAnalysisEtCuts.h AliAnalysisEtCuts.cxx AliAnalysisHadEtCorrections.h AliAnalysisHadEtCorrections.cxx AliAnalysisEtCommon.h AliAnalysisEtCommon.cxx AliAnalysisHadEt.cxx AliAnalysisHadEtMonteCarlo.cxx AliAnalysisHadEtReconstructed.cxx AliAnalysisTaskHadEt.cxx AliAnalysisHadEt.h AliAnalysisHadEtMonteCarlo.h AliAnalysisHadEtReconstructed.h AliAnalysisTaskHadEt.h corrections.root ConfigHadEtAnalysis.C ConfigHadEtMonteCarlo.C ConfigHadEtReconstructed.C");
+   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 corrections.root ConfigHadEtAnalysis.C ConfigHadEtMonteCarlo.C ConfigHadEtReconstructed.C physicsSelections.root");
 // No need for output file names. Procedure is automatic. <-- not true
    plugin->SetDefaultOutputs(kFALSE);
    plugin->SetOutputFiles("Et.ESD.new.sim.root");

diff --git a/PWG4/totEt/macros/runHadEt.C b/PWG4/totEt/macros/runHadEt.C
index 0aacc7a8db73f30f480f6f9df792101dab2fc5ea..b80026e30ab267a222002a262c3423ce176fe31e 100644 (file)
--- a/PWG4/totEt/macros/runHadEt.C
+++ b/PWG4/totEt/macros/runHadEt.C
@@ -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) {
+void runHadEt(bool submit = false, bool data = false, bool PbPb = false) {
     TStopwatch timer;
     timer.Start();
     gSystem->Load("libTree.so");
@@ -26,6 +26,9 @@ void runHadEt(bool submit = false, bool data = false) {
    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");
 
 
@@ -37,14 +40,21 @@ void runHadEt(bool submit = false, bool data = false) {
     gSystem->Load("libRAliEn.so"); 
     TGrid::Connect("alien://") ;
   }
-  chain->Add("/data/LHC10d15/1821/AliESDs.root");//simulation
+  //chain->Add("/data/LHC10h12/999/AliESDs.root");//Hijing Pb+Pb
+  chain->Add("/data/LHC10d15/1821/AliESDs.root");//simulation p+p
   //chain->Add("/data/LHC10dpass2/10000126403050.70/AliESDs.root");//data
 
   // Make the analysis manager
   AliAnalysisManager *mgr = new AliAnalysisManager("TotEtManager");
   if(submit){
-    gROOT->LoadMacro("CreateAlienHandlerHadEtSim.C");
-    AliAnalysisGrid *alienHandler = CreateAlienHandlerHadEtSim();  
+    if(PbPb){
+      gROOT->LoadMacro("CreateAlienHandlerHadEtSimPbPb.C");
+      AliAnalysisGrid *alienHandler = CreateAlienHandlerHadEtSimPbPb();  
+    }
+    else{
+      gROOT->LoadMacro("CreateAlienHandlerHadEtSim.C");
+      AliAnalysisGrid *alienHandler = CreateAlienHandlerHadEtSim();  
+    }
     if (!alienHandler) return;
     mgr->SetGridHandler(alienHandler);
   }