- adding total Et and Et/ZDC correlation histograms for PHOS and EMCAL

diff --git a/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx b/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx
index d820823a55999c5daa833e1c7c7ef39de1d2791c..44bf349514bb188e08830b5d8a8ced7f783d0100 100644 (file)
--- a/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx
+++ b/HLT/global/physics/AliHLTMultiplicityCorrelations.cxx
@@ -61,7 +61,10 @@ AliHLTMultiplicityCorrelations::AliHLTMultiplicityCorrelations() :
   fTpcBinning(200),fTpcBinningMin(0.),fTpcBinningMax(8000.),
   fZdcBinning(280),fZdcBinningMin(0.),fZdcBinningMax(140.),
   fZemBinning(100),fZemBinningMin(0.),fZemBinningMax(5.),
-  fZnpBinning(200),fZnpBinningMin(0.),fZnpBinningMax(100.) {
+  fZnpBinning(200),fZnpBinningMin(0.),fZnpBinningMax(100.),
+  fProcessPhos(true), fProcessEmcal(true),
+  fPhosTotalEt(0.0), fEmcalTotalEt(0.0),
+  fCaloBinning(100),fCaloBinningMin(0.),fCaloBinningMax(100.){
   // see header file for class documentation
   // or
   // refer to README to build package
@@ -121,7 +124,10 @@ Int_t AliHLTMultiplicityCorrelations::ProcessEvent( AliESDEvent *esd ) {
   // -- TPC .. To be done before the others
   if (fESDEvent->GetNumberOfTracks() > 0)
     iResult = ProcessTPC();
-
+  
+  // -- CALO, process with or without clusters, we want the zero-bin
+  iResult = ProcessCALO();
+  
   // -- VZERO
   if (fESDVZERO)
     iResult = ProcessVZERO();
@@ -188,6 +194,7 @@ Int_t AliHLTMultiplicityCorrelations::SetupHistograms() {
   iResult = SetupVZERO();
   iResult = SetupZDC();
   iResult = SetupTPC();
+  iResult = SetupCALO();
   iResult = SetupCorrelations();
 
   return iResult;
@@ -536,6 +543,19 @@ Int_t AliHLTMultiplicityCorrelations::SetupCorrelations() {
                          "Multiplicity^{VZERO} vs N_{ch}^{TPC} C;Multiplicity_{flagged}^{VZERO};N_{ch}^{TPC}", 
                          fVzeroBinning,fVzeroBinningMin,fVzeroBinningMax, fTpcBinning,fTpcBinningMin,fTpcBinningMax));
 
+  // ----------------------------------------------------
+  //   ZDC vs CALO
+  // ----------------------------------------------------
+  fHistList->Add(new TH2F("fCorrZdcTotEvsPhosTotEt", 
+                         "Total E_{ZDC} vs Total E_{T} in PHOS C;Total E_{ZDC} (TeV);E_{T} (GeV)", 
+                         fZdcBinning,fZdcBinningMin,fZdcBinningMax, fCaloBinning,fCaloBinningMin,fCaloBinningMax));
+  fHistList->Add(new TH2F("fCorrZdcTotEvsEmcalTotEt", 
+                         "Total E_{ZDC} vs Total E_{T} in EMCAL C;Total E_{ZDC} (TeV);E_{T} (GeV)", 
+                         fZdcBinning,fZdcBinningMin,fZdcBinningMax, fCaloBinning,fCaloBinningMin,fCaloBinningMax));
+  fHistList->Add(new TH2F("fCorrZdcTotEvsTotEt", 
+                         "Total E_{ZDC} vs Total E_{T} in calorimeters C;Total E_{ZDC} (TeV);E_{T} (GeV)", 
+                         fZdcBinning,fZdcBinningMin,fZdcBinningMax, fCaloBinning,fCaloBinningMin,fCaloBinningMax));
+                         
   // ----------------------------------------------------
   //  
   // ----------------------------------------------------
@@ -543,6 +563,28 @@ Int_t AliHLTMultiplicityCorrelations::SetupCorrelations() {
   return 0;
 }
 
+//##################################################################################
+Int_t AliHLTMultiplicityCorrelations::SetupCALO()
+{
+  // Calo histos
+  if(fProcessPhos)
+  {
+    fHistList->Add(new TH1F("fPhosEt",  "Total E_{T} in PHOS:E (GeV)",   
+                           fCaloBinning,fCaloBinningMin,fCaloBinningMax));
+  }
+  if(fProcessEmcal)
+  {
+    fHistList->Add(new TH1F("fEmcalEt",  "Total E_{T} in EMCAL:E (GeV)",   
+                           fCaloBinning,fCaloBinningMin,fCaloBinningMax));
+  }
+  if(fProcessPhos || fProcessEmcal)
+  {
+    fHistList->Add(new TH1F("fTotalEt",  "Total E_{T} in calorimeters:E (GeV)",   
+                           fCaloBinning,fCaloBinningMin,fCaloBinningMax));
+  }
+  return 0;
+}
+
 /*
  * ---------------------------------------------------------------------------------
  *                               Process - private
@@ -806,5 +848,51 @@ Int_t AliHLTMultiplicityCorrelations::ProcessZDC() {
     (static_cast<TH2F*>(fHistList->FindObject("fCorrZdcbVzeroFC")))->Fill(fESDZDC->GetImpactParamSideC(), fVzeroMultFlaggedC);
   }
 
+  // -- ZDC - CALO correlations
+  if (fProcessPhos || fProcessEmcal) {
+    (static_cast<TH2F*>(fHistList->FindObject("fCorrZdcTotEvsTotEt")))->Fill(zdcE, fPhosTotalEt + fEmcalTotalEt);
+    if(fProcessPhos)
+    {
+      (static_cast<TH2F*>(fHistList->FindObject("fCorrZdcTotEvsPhosTotEt")))->Fill(zdcE, fPhosTotalEt);
+    }
+    if(fProcessEmcal)
+    {
+      (static_cast<TH2F*>(fHistList->FindObject("fCorrZdcTotEvsEmcalTotEt")))->Fill(zdcE, fEmcalTotalEt);
+    }
+  }
+
   return iResult;
 }
+
+//##################################################################################
+Int_t AliHLTMultiplicityCorrelations::ProcessCALO()
+{
+  // CALO 
+  
+  TH1F* hPhosEt = static_cast<TH1F*>(fHistList->FindObject("fPhosEt")); // PHOS Tot E_T
+  TH1F* hEmcalEt = static_cast<TH1F*>(fHistList->FindObject("fEmcalEt")); // EMCAL Tot E_T
+  TH1F* hTotalEt = static_cast<TH1F*>(fHistList->FindObject("fTotalEt")); // CALO Tot E_T
+  
+  fPhosTotalEt = 0;
+  fEmcalTotalEt = 0;
+  
+  for(Int_t cl = 0; cl < fESDEvent->GetNumberOfCaloClusters(); cl++)
+  {
+    
+    AliESDCaloCluster *cluster = fESDEvent->GetCaloCluster(cl);
+    if(cluster->IsPHOS() && fProcessPhos)
+    {
+      fPhosTotalEt += cluster->E();
+    }
+    if(cluster->IsEMCAL() && fProcessEmcal)
+    {
+      fEmcalTotalEt += cluster->E();
+    }
+  }
+
+  if(hPhosEt)hPhosEt->Fill(fPhosTotalEt);
+  if(hEmcalEt)hEmcalEt->Fill(fEmcalTotalEt);
+  if(hTotalEt)hTotalEt->Fill(fPhosTotalEt + fEmcalTotalEt);
+  
+  return 0;
+}

diff --git a/HLT/global/physics/AliHLTMultiplicityCorrelations.h b/HLT/global/physics/AliHLTMultiplicityCorrelations.h
index 4535c92882b66c804c8dd7ed350bdc69961ba5c4..06bf097a8c5fc9fc045c74f021d02f2398f5930e 100644 (file)
--- a/HLT/global/physics/AliHLTMultiplicityCorrelations.h
+++ b/HLT/global/physics/AliHLTMultiplicityCorrelations.h
@@ -96,6 +96,11 @@ public:
     fZnpBinning = i; fZnpBinningMin = f1; fZnpBinningMax = f2;
   }
 
+  /** Set Binning of CALO */
+  void SetBinningCalo(Int_t i=1, Float_t f1=0., Float_t f2=1.) {
+    fCaloBinning = i; fCaloBinningMin = f1; fCaloBinningMax = f2;
+  }
+
   /*
    * ---------------------------------------------------------------------------------
    *                                 Getter - public
@@ -150,6 +155,9 @@ public:
 
   /** Setup correlation histograms */
   Int_t SetupCorrelations();
+  
+  /** Setup CALO histograms */
+  Int_t SetupCALO();
 
   /*
    * ---------------------------------------------------------------------------------
@@ -165,6 +173,11 @@ public:
 
   /** Process current event - ZDC and correlations */
   Int_t ProcessZDC();
+  
+  /** Process current event - CALO */
+  Int_t ProcessCALO();
+  
+  
 
   /*
    * ---------------------------------------------------------------------------------
@@ -246,6 +259,19 @@ public:
   Float_t fZnpBinningMin;
   Float_t fZnpBinningMax;
   
+  /** CALO flags */
+  Bool_t fProcessPhos; 
+  Bool_t fProcessEmcal;
+  
+  /** CALO variables */
+  Float_t fPhosTotalEt;
+  Float_t fEmcalTotalEt;
+  
+  /** Binnning CALO */
+  Int_t   fCaloBinning;
+  Float_t fCaloBinningMin;
+  Float_t fCaloBinningMax;
+  
   ClassDef(AliHLTMultiplicityCorrelations, 1);
 };
 #endif

diff --git a/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx b/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx
index eb9b52a7ebb858d5eda8182f7bb498c7ed1eca15..c9f7d8317c21c59c5eadd1e4b042b1fde29e8100 100644 (file)
--- a/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx
+++ b/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.cxx
@@ -425,6 +425,21 @@ Int_t AliHLTMultiplicityCorrelationsComponent::ScanConfigurationArgument(Int_t a
     fCorrObj->SetBinningZem(binning, min, max);
     return 4;
   }
+  // binningZem
+  if (argument.CompareTo("-binningCalo")==0) {
+    if (++ii>=argc) return -EPROTO;
+    argument=argv[ii];
+    Int_t binning = argument.Atoi();
+    if (++ii>=argc) return -EPROTO;
+    argument=argv[ii];
+    Float_t min = argument.Atof();
+    if (++ii>=argc) return -EPROTO;
+    argument=argv[ii];
+    Float_t max = argument.Atof();
+
+    fCorrObj->SetBinningCalo(binning, min, max);
+    return 4;
+  }
 
   // unknown argument
   return -EINVAL;

diff --git a/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.h b/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.h
index 0428cb6f8e96da8e138dd5db12828db37554f5b4..e93560ca780f169734534cb36348005d42135191 100644 (file)
--- a/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.h
+++ b/HLT/global/physics/AliHLTMultiplicityCorrelationsComponent.h
@@ -70,6 +70,8 @@ class AliHLTMultiplicityCorrelations;
  *       bins (Int_t), minBin (Float_t), maxBin (Float_t)
  * \li -binningZem    <i> bins min max  </i> <br>
  *       bins (Int_t), minBin (Float_t), maxBin (Float_t)
+ * \li -binningCalo    <i> bins min max  </i> <br>
+ *       bins (Int_t), minBin (Float_t), maxBin (Float_t)
  *
  * <h2>Default CDB entries:</h2>
  * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->