Include the possibility to set the ZNA & ZNC time cuts through the TriggerAnalysis...

diff --git a/ANALYSIS/AliPhysicsSelection.cxx b/ANALYSIS/AliPhysicsSelection.cxx
index 0bad5be5d9c2d5b0a0b663cd71d6bfee8d44c829..29814abc3e2661a6c0bd1269fd874157983d5765 100644 (file)
--- a/ANALYSIS/AliPhysicsSelection.cxx
+++ b/ANALYSIS/AliPhysicsSelection.cxx
@@ -1014,6 +1014,8 @@ Bool_t AliPhysicsSelection::Initialize(Int_t runNumber)
                                           fTriggerOADB->GetZDCCutRefDeltaCorr(), 
                                           fTriggerOADB->GetZDCCutSigmaSumCorr(),
                                           fTriggerOADB->GetZDCCutSigmaDeltaCorr());
+      triggerAnalysis->SetZNCorrCutParams(fTriggerOADB->GetZDCCutZNATimeCorr(),
+                                         fTriggerOADB->GetZDCCutZNCTimeCorr());
       fTriggerAnalysis.Add(triggerAnalysis);
     }
 

diff --git a/ANALYSIS/AliTriggerAnalysis.cxx b/ANALYSIS/AliTriggerAnalysis.cxx
index 218e31cf5a62873f9674609812bb8e8ea251b78a..3629799656dfba1b38c734ad15e977cfab90a9db 100644 (file)
--- a/ANALYSIS/AliTriggerAnalysis.cxx
+++ b/ANALYSIS/AliTriggerAnalysis.cxx
@@ -63,6 +63,8 @@ AliTriggerAnalysis::AliTriggerAnalysis() :
   fZDCCutRefDeltaCorr(-2.1),
   fZDCCutSigmaSumCorr(6.0),
   fZDCCutSigmaDeltaCorr(1.2),
+  fZDCCutZNATimeCorr(2.0),
+  fZDCCutZNCTimeCorr(5.0),
   fASPDCvsTCut(65),
   fBSPDCvsTCut(4),
   fDoFMD(kTRUE),
@@ -1467,8 +1469,8 @@ Bool_t AliTriggerAnalysis::ZDCTimeBGTrigger(const AliESDEvent *aEsd, AliceSide s
     return kFALSE;
   }
 
-  Bool_t znabg = (zna && (TMath::Abs(tdcAcorr)>2.0));
-  Bool_t zncbg = (znc && (TMath::Abs(tdcCcorr)>5.0));
+  Bool_t znabg = (zna && (TMath::Abs(tdcAcorr)>fZDCCutZNATimeCorr));
+  Bool_t zncbg = (znc && (TMath::Abs(tdcCcorr)>fZDCCutZNCTimeCorr));
 
   // Printf("Checking ZN background (time) for run %d, A = %d, time=%2.2f, C = %d, time=%2.2f",runNumber,(Int_t)zna,tdcAcorr,(Int_t)znc,tdcCcorr);
   // Printf("Checking ZN background (time) for run %d, A-BG = %d, C-BG = %d",runNumber,(Int_t)znabg,(Int_t)zncbg);

diff --git a/ANALYSIS/AliTriggerAnalysis.h b/ANALYSIS/AliTriggerAnalysis.h
index 221f17f06269627e4708b0dabeee88060d5d3042..b46930a5e9544e815ebe4e761ff55a904f9bdb44 100644 (file)
--- a/ANALYSIS/AliTriggerAnalysis.h
+++ b/ANALYSIS/AliTriggerAnalysis.h
@@ -84,6 +84,8 @@ class AliTriggerAnalysis : public TObject
     void SetDoFMD(Bool_t flag = kTRUE) {fDoFMD = flag;}
     void SetZDCCutParams(Float_t refSum, Float_t refDelta, Float_t sigmaSum, Float_t sigmaDelta) { fZDCCutRefSum = refSum; fZDCCutRefDelta = refDelta; fZDCCutSigmaSum = sigmaSum; fZDCCutSigmaDelta = sigmaDelta; }
     void SetCorrZDCCutParams(Float_t refSum, Float_t refDelta, Float_t sigmaSum, Float_t sigmaDelta) { fZDCCutRefSumCorr = refSum; fZDCCutRefDeltaCorr = refDelta; fZDCCutSigmaSumCorr = sigmaSum; fZDCCutSigmaDeltaCorr = sigmaDelta; }
+    void SetZNCorrCutParams(Float_t znaTimeCorr, Float_t zncTimeCorr)
+    { fZDCCutZNATimeCorr = znaTimeCorr; fZDCCutZNCTimeCorr = zncTimeCorr; }
 
     Int_t GetSPDGFOThreshhold() const { return fSPDGFOThreshold; }
     Float_t GetV0TimeOffset() const { return fV0TimeOffset; }
@@ -133,6 +135,9 @@ class AliTriggerAnalysis : public TObject
     Float_t fZDCCutSigmaSumCorr;    // Corrected ZDC time cut configuration
     Float_t fZDCCutSigmaDeltaCorr;  // Corrected ZDC time cut configuration
 
+    Float_t fZDCCutZNATimeCorr;     // Corrected ZNA time cut configuration
+    Float_t fZDCCutZNCTimeCorr;     // Corrected ZNA time cut configuration
+
     Float_t fASPDCvsTCut; // constant for the linear cut in SPD clusters vs tracklets
     Float_t fBSPDCvsTCut; // slope for the linear cut in SPD  clusters vs tracklets
 
@@ -163,7 +168,7 @@ class AliTriggerAnalysis : public TObject
 
     Bool_t fTPCOnly;         // flag to set whether TPC only tracks have to be used for the offline trigger 
 
-    ClassDef(AliTriggerAnalysis, 18)
+    ClassDef(AliTriggerAnalysis, 19)
     
   private:
     AliTriggerAnalysis(const AliTriggerAnalysis&);

diff --git a/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C b/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C
index ef5b69d76eadd125adb690195e993c656e5878ff..c1db0d68f69617b33e3be582cdecef988832d4c6 100644 (file)
--- a/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C
+++ b/ANALYSIS/macros/BrowseAndFillPhysicsSelectionOADB.C
@@ -1436,12 +1436,17 @@ void BrowseAndFillPhysicsSelectionOADB(Bool_t fill = kFALSE) {
   oadbTrigAnalysisZDC6->SetZDCCorrParameters(-65.6, -2.1, 4*0.58, 4*0.5);
   oadbContTriggerAnalysis->AppendObject(oadbTrigAnalysisZDC6, 138924, 139517);  
 
+  AliOADBTriggerAnalysis * oadbTrigAnalysisZDC7 = new AliOADBTriggerAnalysis("ZDCCut7");
+  oadbTrigAnalysisZDC7->SetZNCorrParameters(2.0,5.0);
+  oadbContTriggerAnalysis->AppendObject(oadbTrigAnalysisZDC7, 194713, 250000);
+
   oadbTrigAnalysisZDC1->Print();
   oadbTrigAnalysisZDC2->Print();
   oadbTrigAnalysisZDC3->Print();
   oadbTrigAnalysisZDC4->Print();
   oadbTrigAnalysisZDC5->Print();
   oadbTrigAnalysisZDC6->Print();
+  oadbTrigAnalysisZDC7->Print();
 
   
   // ----------------- visualize coverage

diff --git a/OADB/AliOADBTriggerAnalysis.cxx b/OADB/AliOADBTriggerAnalysis.cxx
index 2bb0f16e21aff4c77c1dd13e2a9e3e8baf32ffc0..4a53a815bc65340029c56a5e492db315067c27a7 100644 (file)
--- a/OADB/AliOADBTriggerAnalysis.cxx
+++ b/OADB/AliOADBTriggerAnalysis.cxx
@@ -17,7 +17,9 @@ AliOADBTriggerAnalysis::AliOADBTriggerAnalysis() : TNamed("AliOADBTriggerAnalysi
   fZDCCutRefSumCorr(-65.5),
   fZDCCutRefDeltaCorr(-2.1),
   fZDCCutSigmaSumCorr(6.0),
-  fZDCCutSigmaDeltaCorr(1.2)
+  fZDCCutSigmaDeltaCorr(1.2),
+  fZDCCutZNATimeCorr(2.0),
+  fZDCCutZNCTimeCorr(5.0)
 {
   // default ctor
 
@@ -27,7 +29,9 @@ AliOADBTriggerAnalysis::AliOADBTriggerAnalysis(char* name) : TNamed(name, "OADB
   fZDCCutRefSumCorr(-65.5),
   fZDCCutRefDeltaCorr(-2.1),
   fZDCCutSigmaSumCorr(6.0),
-  fZDCCutSigmaDeltaCorr(1.2)
+  fZDCCutSigmaDeltaCorr(1.2),
+  fZDCCutZNATimeCorr(2.0),
+  fZDCCutZNCTimeCorr(5.0)
 {
   // ctor
   // Init();
@@ -56,18 +60,22 @@ void AliOADBTriggerAnalysis::Browse(TBrowser *b)
   static TObjString * strZDCCutRefDeltaCorr   =0;  
   static TObjString * strZDCCutSigmaSumCorr   =0;  
   static TObjString * strZDCCutSigmaDeltaCorr =0;
+  static TObjString * strZDCCutZNATimeCorr    =0;
+  static TObjString * strZDCCutZNCTimeCorr    =0;
 
   if(strZDCCutRefSumCorr     ) delete strZDCCutRefSumCorr     ;
   if(strZDCCutRefDeltaCorr   ) delete strZDCCutRefDeltaCorr   ;
   if(strZDCCutSigmaSumCorr   ) delete strZDCCutSigmaSumCorr   ;
   if(strZDCCutSigmaDeltaCorr ) delete strZDCCutSigmaDeltaCorr ;
+  if(strZDCCutZNATimeCorr    ) delete strZDCCutZNATimeCorr    ;
+  if(strZDCCutZNCTimeCorr    ) delete strZDCCutZNCTimeCorr    ;
   
   strZDCCutRefSumCorr     = new TObjString(Form("ZDCCutRefSumCorr     %f", fZDCCutRefSumCorr    )); 
   strZDCCutRefDeltaCorr   = new TObjString(Form("ZDCCutRefDeltaCorr   %f", fZDCCutRefDeltaCorr  )); 
   strZDCCutSigmaSumCorr   = new TObjString(Form("ZDCCutSigmaSumCorr   %f", fZDCCutSigmaSumCorr  )); 
   strZDCCutSigmaDeltaCorr = new TObjString(Form("ZDCCutSigmaDeltaCorr %f", fZDCCutSigmaDeltaCorr)); 
-
-
+  strZDCCutZNATimeCorr    = new TObjString(Form("ZDCCutZNATimeCorr    %f", fZDCCutZNATimeCorr   ));
+  strZDCCutZNCTimeCorr    = new TObjString(Form("ZDCCutZNCTimeCorr    %f", fZDCCutZNCTimeCorr   ));
 
   if (b) {
     // Creates a folder for each beam type containing the list of corresponding bx ids
@@ -75,6 +83,8 @@ void AliOADBTriggerAnalysis::Browse(TBrowser *b)
     b->Add(strZDCCutRefDeltaCorr  );
     b->Add(strZDCCutSigmaSumCorr  );
     b->Add(strZDCCutSigmaDeltaCorr);
+    b->Add(strZDCCutZNATimeCorr   );
+    b->Add(strZDCCutZNCTimeCorr   );
   }     
   else
     TObject::Browse(b);
@@ -88,7 +98,8 @@ void AliOADBTriggerAnalysis::Print(Option_t* option) const {
   cout << " - ZDCCutRefDeltaCorr   "<< fZDCCutRefDeltaCorr   << endl;
   cout << " - ZDCCutSigmaSumCorr   "<< fZDCCutSigmaSumCorr   << endl;
   cout << " - ZDCCutSigmaDeltaCorr "<< fZDCCutSigmaDeltaCorr << endl;
+  cout << " - ZDCCutZNATimeCorr    "<< fZDCCutZNATimeCorr    << endl;
+  cout << " - ZDCCutZNCTimeCorr    "<< fZDCCutZNCTimeCorr    << endl;
   cout << option << endl;
-  
 
 }

diff --git a/OADB/AliOADBTriggerAnalysis.h b/OADB/AliOADBTriggerAnalysis.h
index f09df77dfc204e2814bed2d39a3fed546e9ba518..d2a64940734f8f1ab2caf6b74928f9298e395cad 100644 (file)
--- a/OADB/AliOADBTriggerAnalysis.h
+++ b/OADB/AliOADBTriggerAnalysis.h
@@ -28,9 +28,13 @@ class AliOADBTriggerAnalysis : public TNamed {
   Float_t GetZDCCutRefDeltaCorr()   { return fZDCCutRefDeltaCorr;   }   
   Float_t GetZDCCutSigmaSumCorr()   { return fZDCCutSigmaSumCorr;   }   
   Float_t GetZDCCutSigmaDeltaCorr() { return fZDCCutSigmaDeltaCorr; }  
+  Float_t GetZDCCutZNATimeCorr()    { return fZDCCutZNATimeCorr;    }
+  Float_t GetZDCCutZNCTimeCorr()    { return fZDCCutZNCTimeCorr;    }
   // Setters
   void SetZDCCorrParameters(Float_t sumCorr, Float_t deltaCorr, Float_t sigmaSumCorr, Float_t sigmaDeltaCorr) 
   { fZDCCutRefSumCorr = sumCorr; fZDCCutRefDeltaCorr = deltaCorr; fZDCCutSigmaSumCorr = sigmaSumCorr; fZDCCutSigmaDeltaCorr = sigmaDeltaCorr;}
+  void SetZNCorrParameters(Float_t znaTimeCorr, Float_t zncTimeCorr)
+  { fZDCCutZNATimeCorr = znaTimeCorr; fZDCCutZNCTimeCorr = zncTimeCorr; }
   // Browse
   virtual Bool_t       IsFolder() const { return kTRUE; }
   void Browse(TBrowser *b);
@@ -43,12 +47,14 @@ class AliOADBTriggerAnalysis : public TNamed {
   Float_t fZDCCutRefDeltaCorr;    // Corrected ZDC time cut configuration
   Float_t fZDCCutSigmaSumCorr;    // Corrected ZDC time cut configuration
   Float_t fZDCCutSigmaDeltaCorr;  // Corrected ZDC time cut configuration  
+  Float_t fZDCCutZNATimeCorr;     // Corrected ZNA time cut configuration
+  Float_t fZDCCutZNCTimeCorr;     // Corrected ZNC time cut configuration
 
   AliOADBTriggerAnalysis(const AliOADBTriggerAnalysis& cont);  // not implemented
   AliOADBTriggerAnalysis& operator=(const AliOADBTriggerAnalysis& cont); // not implemented
 
 
-  ClassDef(AliOADBTriggerAnalysis, 1);
+  ClassDef(AliOADBTriggerAnalysis, 2);
 };
 
 #endif

diff --git a/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root b/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root
index 7a62637f105d8b9362fa1ff28a53f8c5572b0c99..ba189f6ae0849a52b2036ae74fe44dc08d054a79 100644 (file)
Binary files a/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root and b/OADB/COMMON/PHYSICSSELECTION/data/physicsSelection.root differ