Updates for embedding on AOD level

[u/mrichter/AliRoot.git] / STEER / AliLHCData.h

diff --git a/STEER/AliLHCData.h b/STEER/AliLHCData.h
index c807ae8a883c794616a21cb37e1b12a5bd09ef02..cac97013c5b1e1c4d442f53cbc46a64bb04967ca 100755 (executable)
--- a/STEER/AliLHCData.h
+++ b/STEER/AliLHCData.h
@@ -50,6 +50,8 @@ class AliLHCData : public TObject
   enum Collim_t {kTCTVB4L2, kTCTVB4R2, kTCLIA4R2, kNCollimators};\r
   enum ColJaw_t {kGapDn,kGapUp,kLeftDn,kLeftUp,kRightDn,kRightUp,kNJaws};\r
   enum          {kMaxBSlots = 3564};\r
+  enum          {kMarginSOR = 60*60*24*30, // use margin of 30 days for SOR, when looking for the 1st record\r
+                kMarginEOR = 60*15};      // use margin of 15 min for EOR, when looking for the last record\r
   //\r
   enum {kIntTot,kIntTotAv,kIntBunchAv,\r
        kLumAcqMode,kLumTot,kLumTotErr,kLumBunch,kLumBunchErr,kLumCrossAng,kLumCrossAngErr,\r
@@ -74,6 +76,7 @@ class AliLHCData : public TObject
   void                  SetFillNumber(Int_t fill)                          {fFillNumber = fill;}\r
   void                  SetTMin(Double_t t)                                {fTMin = t<0?0:(t>1e10?1e10:t);}\r
   void                  SetTMax(Double_t t)                                {fTMax = t<0?0:(t>1e10?1e10:t);}\r
+  //\r
   virtual void          Print(const Option_t *opt="")                const;\r
   //\r
   Int_t GetNBunchConfigMeasured(int bm)           const {return GoodPairID(bm)?fBunchConfMeas[bm][kNStor]:-1;}\r
@@ -153,12 +156,15 @@ class AliLHCData : public TObject
   //\r
   const TObjArray&  GetData()                             const {return fData;}\r
   //\r
+  // analysis methods\r
+  Int_t GetMeanIntensity(int beamID, Double_t &colliding, Double_t &noncolliding) const;\r
+  //\r
  protected:\r
   //\r
   Bool_t                FillData(double tmin=0, double tmax=1.e20);\r
   virtual void          Clear(const Option_t *opt="");\r
   void                  PrintAux(Bool_t full,const Int_t refs[2],const Option_t *opt="") const;\r
-  TObjArray*            GetDCSEntry(const char* key,int &entry,double tmin,double tmax) const;\r
+  TObjArray*            GetDCSEntry(const char* key,int &entry,int &last,double tmin,double tmax) const;\r
   Int_t                 FillScalarRecord(  int refs[2], const char* rec, const char* recErr=0);\r
   Int_t                 FillBunchConfig(   int refs[2], const char* rec);\r
   Int_t                 FillStringRecord(  int refs[2], const char* rec);\r