Quick fix for bug 71658

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

diff --git a/STEER/AliGRPObject.h b/STEER/AliGRPObject.h
index 193043db65800718f56cf985d92341c5ad6c8212..e2f7e18f8a56064687048e9a91da795e4144a923 100644 (file)
--- a/STEER/AliGRPObject.h
+++ b/STEER/AliGRPObject.h
@@ -62,12 +62,6 @@ class AliGRPObject : public TObject {
        TString   GetMachineMode() const {return fMachineMode;}\r
        TObjArray*   GetLHCStateArray() const {return fLHCStateArray;}\r
        TObjArray*   GetMachineModeArray() const {return fMachineModeArray;}\r
-       Float_t*  GetLHCLuminosity() const {return fLHCLuminosity;}\r
-       Float_t   GetLHCLuminosity(Stats stat) const {return fLHCLuminosity[stat];}\r
-       AliSplineFit*  GetLHCLuminositySplineFit() const {return fLHCLuminositySplineFit;}\r
-       Float_t*  GetBeamIntensity() const {return fBeamIntensity;}\r
-       Float_t   GetBeamIntensity(Stats stat) const {return fBeamIntensity[stat];}\r
-       AliSplineFit*  GetBeamIntensitySplineFit() const {return fBeamIntensitySplineFit;}\r
        Char_t    GetL3Polarity() const {return fL3Polarity;}\r
        Char_t    GetDipolePolarity() const {return fDipolePolarity;}\r
        Float_t*  GetL3Current() const {return fL3Current;}\r
@@ -87,6 +81,8 @@ class AliGRPObject : public TObject {
        Int_t    GetPoints() const {return fPoints;}\r
        Int_t    GetDimension() const {return fDimension;}\r
 \r
+       Double_t GetMaxTimeLHCValidity() const {return fMaxTimeLHCValidity;}\r
+\r
        // setters\r
        void SetBeamEnergyIsSqrtSHalfGeV(Bool_t v=kTRUE) {SetBit(kConvSqrtSHalfGeV,v);}\r
        void SetPolarityConventionLHC(Bool_t v=kTRUE) {return SetBit(kPolConvLHC,v);}\r
@@ -103,16 +99,6 @@ class AliGRPObject : public TObject {
        void SetMachineMode(TString machineMode)  {fMachineMode = machineMode;}\r
        void SetLHCStateArray(TObjArray* lhcStateArray)  {fLHCStateArray = lhcStateArray;}\r
        void SetMachineModeArray(TObjArray* machineModeArray)  {fMachineModeArray = machineModeArray;}\r
-       void SetLHCLuminosity(const Float_t* lhcLuminosity)  {\r
-               for (Int_t i = 0;i<fPoints;i++) fLHCLuminosity[i] = lhcLuminosity[i];\r
-       }\r
-       void SetLHCLuminosity(Float_t lhcLuminosity, Stats stat)  {fLHCLuminosity[stat] = lhcLuminosity;}\r
-       void SetLHCLuminositySplineFit(AliSplineFit* const lhcLuminositySplineFit)  {fLHCLuminositySplineFit = lhcLuminositySplineFit;}\r
-       void SetBeamIntensity(const Float_t* beamIntensity)  {\r
-               for (Int_t i = 0;i<fPoints;i++) fBeamIntensity[i] = beamIntensity[i];\r
-       }\r
-       void SetBeamIntensity(Float_t beamIntensity, Stats stat)  {fBeamIntensity[stat] = beamIntensity;}\r
-       void SetBeamIntensitySplineFit(AliSplineFit* const beamIntensitySplineFit)  {fBeamIntensitySplineFit = beamIntensitySplineFit;}\r
        void SetL3Polarity(Char_t l3Polarity)  {fL3Polarity = l3Polarity;}\r
        void SetDipolePolarity(Char_t dipolePolarity)  {fDipolePolarity = dipolePolarity;}\r
        void SetL3Current(const Float_t* l3Current)  {\r
@@ -138,6 +124,7 @@ class AliGRPObject : public TObject {
        void SetHallProbes(DP_HallProbes hp, const Float_t* hall_probe);  \r
        void SetPoints(Int_t points) {fPoints = points;}\r
        void SetDimension(Int_t dimension) {fDimension = dimension;}\r
+       void SetMaxTimeLHCValidity(Double_t maxTimeLHCValidity) {fMaxTimeLHCValidity = maxTimeLHCValidity;}\r
 \r
        // getters for "invalid" flags\r
 \r
@@ -175,12 +162,6 @@ class AliGRPObject : public TObject {
        TString  fLHCPeriod;              // LHCperiod entry from DAQ logbook \r
        TString  fRunType;                // RunType entry from DAQ logbook \r
        TString  fLHCState;               // LHCState entry from DCS DB\r
-       Float_t*  fLHCLuminosity;         // [fPoints]\r
-                                         // LHCLuminosity entry from DCS DB\r
-       AliSplineFit*  fLHCLuminositySplineFit;       // LHCLuminosity SplineFit from DCS DB\r
-       Float_t*  fBeamIntensity   ;      // [fPoints]\r
-                                         // BeamIntensity entry from DCS DB\r
-       AliSplineFit*  fBeamIntensitySplineFit;       // BeamIntensity SplineFit from DCS DB\r
        Char_t    fL3Polarity;            // L3Polarity entry from DCS DB\r
        Char_t    fDipolePolarity;        // DipolePolarity entry from DCS DB                                     \r
        Float_t*  fL3Current;             // [fPoints]\r
@@ -203,7 +184,9 @@ class AliGRPObject : public TObject {
        TObjArray* fLHCStateArray;     // Array of values for the LHC State\r
        TObjArray* fMachineModeArray;  // Array of values for the LHC State\r
 \r
-       ClassDef(AliGRPObject,4)\r
+       Double_t fMaxTimeLHCValidity;    // time until which the LHC Data Machine Mode and Beam Mode didn't change \r
+\r
+       ClassDef(AliGRPObject,6)\r
 \r
 };\r
 \r