add counter histogram before event rejections, switch track BC control histograms...

diff --git a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx
index 38de96ff0036076d97ab412fc5f8507b35c8f4fe..0caab97bc0698239d4b59e804ca6e3eccfa75e3c 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx
+++ b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.cxx
@@ -52,8 +52,8 @@ fAnaDebug(0),                 fCuts(new TList),
 fScaleFactor(-1),
 fFillDataControlHisto(kTRUE),
 // Control histograms
-fhNEvents(0),                 fhNExoticEvents(0),
-fhNEventsNoTriggerFound(0),
+fhNEventsIn(0),               fhNEvents(0),
+fhNExoticEvents(0),           fhNEventsNoTriggerFound(0),
 fhNPileUpEvents(0),           fhNPileUpEventsTriggerBC0(0),
 fhXVertex(0),                 fhYVertex(0),                       fhZVertex(0),
 fhXVertexExotic(0),           fhYVertexExotic(0),                 fhZVertexExotic(0),
@@ -98,6 +98,7 @@ fMakeHisto(maker.fMakeHisto),  fMakeAOD(maker.fMakeAOD),
 fAnaDebug(maker.fAnaDebug),    fCuts(new TList()),
 fScaleFactor(maker.fScaleFactor),
 fFillDataControlHisto(maker.fFillDataControlHisto),
+fhNEventsIn(maker.fhNEventsIn),
 fhNEvents(maker.fhNEvents),
 fhNExoticEvents(maker.fhNExoticEvents),
 fhNEventsNoTriggerFound(maker.fhNEventsNoTriggerFound),
@@ -284,15 +285,17 @@ void AliAnaCaloTrackCorrMaker::FillControlHistograms()
     
     for(Int_t i = 0; i < 19; i++)
     {
-      if(fReader->GetTrackEventBC(i))   fhTrackBCEvent   ->Fill(i);
-      if(fReader->GetTrackEventBCcut(i))fhTrackBCEventCut->Fill(i);
+      if(fReader->IsAccessToTrackTimeOn())
+      {
+        if(fReader->GetTrackEventBC(i))   fhTrackBCEvent   ->Fill(i);
+        if(fReader->GetTrackEventBCcut(i))fhTrackBCEventCut->Fill(i);
+      }
       if(fReader->GetEMCalEventBC(i))   fhEMCalBCEvent   ->Fill(i);
       if(fReader->GetEMCalEventBCcut(i))fhEMCalBCEventCut->Fill(i);
     }
     
     Int_t bc = fReader->GetVertexBC();
-    if(bc!=AliVTrack::kTOFBCNA)fhPrimaryVertexBC->Fill(bc);
-    
+    if(bc!=AliVTrack::kTOFBCNA) fhPrimaryVertexBC->Fill(bc);
     
     // N pile up vertices
     Int_t nVerticesSPD    = -1;
@@ -347,7 +350,7 @@ void AliAnaCaloTrackCorrMaker::FillTriggerControlHistograms()
   if(triggerId < 0)
   {
     //printf("Trigger id %d\n",triggerId);
-    if(triggerId == -2)fhNEventsNoTriggerFound->Fill(0);
+    if(triggerId == -2) fhNEventsNoTriggerFound->Fill(0);
     triggerBCOK = kFALSE;
   }
   
@@ -449,6 +452,10 @@ TList *AliAnaCaloTrackCorrMaker::GetOutputContainer()
   //GetCaloUtils()->InitEMCALGeometry();
   
   //General event histograms
+
+  fhNEventsIn      = new TH1F("hNEventsIn",   "Number of input events"     , 1 , 0 , 1  ) ;
+  fhNEventsIn->SetYTitle("# events");
+  fOutputContainer->Add(fhNEventsIn);
   
   fhNEvents      = new TH1F("hNEvents",   "Number of analyzed events"     , 1 , 0 , 1  ) ;
   fhNEvents->SetYTitle("# events");
@@ -684,20 +691,22 @@ TList *AliAnaCaloTrackCorrMaker::GetOutputContainer()
     fhNPileUpEventsTriggerBC0->GetXaxis()->SetBinLabel(8 ,"!EMCal && !SPD");
     fOutputContainer->Add(fhNPileUpEventsTriggerBC0);
     
-    
-    fhTrackBCEvent      = new TH1F("hTrackBCEvent",   "Number of events with at least 1 track in a bunch crossing ", 19 , 0 , 19 ) ;
-    fhTrackBCEvent->SetYTitle("# events");
-    fhTrackBCEvent->SetXTitle("Bunch crossing");
-    for(Int_t i = 1; i < 20; i++)
-      fhTrackBCEvent->GetXaxis()->SetBinLabel(i ,Form("%d",i-10));
-    fOutputContainer->Add(fhTrackBCEvent);
-    
-    fhTrackBCEventCut      = new TH1F("hTrackBCEventCut",   "Number of events with at least 1 track in a bunch crossing ", 19 , 0 , 19 ) ;
-    fhTrackBCEventCut->SetYTitle("# events");
-    fhTrackBCEventCut->SetXTitle("Bunch crossing");
-    for(Int_t i = 1; i < 20; i++)
-      fhTrackBCEventCut->GetXaxis()->SetBinLabel(i ,Form("%d",i-10));
-    fOutputContainer->Add(fhTrackBCEventCut);
+    if(fReader->IsAccessToTrackTimeOn())
+    {
+      fhTrackBCEvent      = new TH1F("hTrackBCEvent",   "Number of events with at least 1 track in a bunch crossing ", 19 , 0 , 19 ) ;
+      fhTrackBCEvent->SetYTitle("# events");
+      fhTrackBCEvent->SetXTitle("Bunch crossing");
+      for(Int_t i = 1; i < 20; i++)
+        fhTrackBCEvent->GetXaxis()->SetBinLabel(i ,Form("%d",i-10));
+      fOutputContainer->Add(fhTrackBCEvent);
+      
+      fhTrackBCEventCut      = new TH1F("hTrackBCEventCut",   "Number of events with at least 1 track in a bunch crossing ", 19 , 0 , 19 ) ;
+      fhTrackBCEventCut->SetYTitle("# events");
+      fhTrackBCEventCut->SetXTitle("Bunch crossing");
+      for(Int_t i = 1; i < 20; i++)
+        fhTrackBCEventCut->GetXaxis()->SetBinLabel(i ,Form("%d",i-10));
+      fOutputContainer->Add(fhTrackBCEventCut);
+    }
     
     fhPrimaryVertexBC      = new TH1F("hPrimaryVertexBC", "Number of primary vertex per bunch crossing ", 41 , -20 , 20  ) ;
     fhPrimaryVertexBC->SetYTitle("# events");
@@ -939,7 +948,11 @@ void AliAnaCaloTrackCorrMaker::ProcessEvent(Int_t iEntry, const char * currentFi
   
   //Fill trigger control histograms, make sure it is only for triggered events and
   // not the MB events used for mixing
-  if(fReader->IsEventTriggerAtSEOn() || isTrigger) FillTriggerControlHistograms();
+  if(fReader->IsEventTriggerAtSEOn() || isTrigger)
+  {
+    fhNEventsIn->Fill(0);
+    FillTriggerControlHistograms();
+  }
   
   if(!ok)
   {

diff --git a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.h b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.h
index 9e4eefe83b579bb58d6a484568dd809bdd0f1a16..75ecd684f9b13c594618a565d44e9ba03daf4160 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.h
+++ b/PWG/CaloTrackCorrBase/AliAnaCaloTrackCorrMaker.h
@@ -101,7 +101,8 @@ class AliAnaCaloTrackCorrMaker : public TObject {
   Bool_t   fFillDataControlHisto;//! Fill histograms only interesting with data
   
   // Control histograms
-  TH1F *   fhNEvents;           //! Number of events counter histogram
+  TH1F *   fhNEventsIn;         //! Number of input events counter histogram
+  TH1F *   fhNEvents;           //! Number of acepted events counter histogram
   TH1F *   fhNExoticEvents;     //! Number of events triggered by exotic, counter histogram
   TH1F *   fhNEventsNoTriggerFound; //! number of events where whaetever was done, no trigger is found
   TH1F *   fhNPileUpEvents;     //! N events pasing pile up cut
@@ -120,10 +121,10 @@ class AliAnaCaloTrackCorrMaker : public TObject {
   TH1F *   fhEventPlaneAngle;   //! Histogram with Event plane angle
   TH1F *   fhNMergedFiles;      //! Number of files merged
   TH1F *   fhScaleFactor;       //! Factor to scale histograms
-  TH1F *   fhEMCalBCEvent;      //! N events depending on the existance of a cluster in a given bunch crossing
-  TH1F *   fhEMCalBCEventCut;   //! N events depending on the existance of a cluster above acceptance and E cut in a given bunch crossing
-  TH1F *   fhTrackBCEvent;      //! N events depending on the existance of a track in a given bunch crossing
-  TH1F *   fhTrackBCEventCut;   //! N events depending on the existance of a track above acceptance and pt cut in a given bunch crossing
+  TH1F *   fhEMCalBCEvent;      //! N events depending on the existence of a cluster in a given bunch crossing
+  TH1F *   fhEMCalBCEventCut;   //! N events depending on the existence of a cluster above acceptance and E cut in a given bunch crossing
+  TH1F *   fhTrackBCEvent;      //! N events depending on the existence of a track in a given bunch crossing
+  TH1F *   fhTrackBCEventCut;   //! N events depending on the existence of a track above acceptance and pt cut in a given bunch crossing
   TH1F *   fhPrimaryVertexBC;   //! Primary vertex BC
   TH1F *   fhTimeStampFraction; //! event fraction depending on Time Stamp, only if activated on reader
   TH1F *   fhNPileUpVertSPD;    //! number of pile-up vertices from SPD
@@ -154,7 +155,7 @@ class AliAnaCaloTrackCorrMaker : public TObject {
   
   AliAnaCaloTrackCorrMaker & operator = (const AliAnaCaloTrackCorrMaker & ) ; // cpy assignment
   
-  ClassDef(AliAnaCaloTrackCorrMaker,21)
+  ClassDef(AliAnaCaloTrackCorrMaker,22)
 } ;