Adding TString in the included files.

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

diff --git a/STEER/AliGRPObject.h b/STEER/AliGRPObject.h
index 799929bb3634bbfb756f970684344149e42519d4..7acff8aee3f820613689a7e1c0a3c38431f354fc 100644 (file)
--- a/STEER/AliGRPObject.h
+++ b/STEER/AliGRPObject.h
@@ -13,6 +13,7 @@
 // \r
 \r
 #include <time.h>\r
 // \r
 \r
 #include <time.h>\r

+#include <TString.h>\r

 \r
 class TMap;\r
 \r
 \r
 class TMap;\r
 \r


@@ -24,6 +25,8 @@ class AliGRPObject : public TObject {
  public:\r
 \r
        enum Stats {kMean = 0, kTruncMean = 1, kMedian = 2, kSDMean = 3, kSDMedian = 4};\r
  public:\r
 \r
        enum Stats {kMean = 0, kTruncMean = 1, kMedian = 2, kSDMean = 3, kSDMedian = 4};\r

+       \r
+       enum StatusBits {kPolConvLHC = BIT(14), kUniformBMap = BIT(15)};\r

 \r
        enum DP_HallProbes { \r
                 khpL3bsf17H1= 0 , khpL3bsf17H2, khpL3bsf17H3, khpL3bsf17Temperature, \r
 \r
        enum DP_HallProbes { \r
                 khpL3bsf17H1= 0 , khpL3bsf17H2, khpL3bsf17H3, khpL3bsf17Temperature, \r


@@ -45,12 +48,14 @@ class AliGRPObject : public TObject {
 \r
        // getters\r
 \r
 \r
        // getters\r
 \r

+       Bool_t    IsPolarityConventionLHC() const {return TestBit(kPolConvLHC);}\r
+       Bool_t    IsUniformBMap() const {return TestBit(kUniformBMap);}\r

        time_t    GetTimeStart() const {return fTimeStart;}\r
        time_t    GetTimeEnd() const {return fTimeEnd;}\r
        Float_t   GetBeamEnergy() const {return fBeamEnergy;}\r
        TString   GetBeamType() const {return fBeamType;}\r
        Char_t    GetNumberOfDetectors() const {return fNumberOfDetectors;}\r
        time_t    GetTimeStart() const {return fTimeStart;}\r
        time_t    GetTimeEnd() const {return fTimeEnd;}\r
        Float_t   GetBeamEnergy() const {return fBeamEnergy;}\r
        TString   GetBeamType() const {return fBeamType;}\r
        Char_t    GetNumberOfDetectors() const {return fNumberOfDetectors;}\r

-       UInt_t     GetDetectorMask() const {return fDetectorMask;}\r
+       UInt_t    GetDetectorMask() const {return fDetectorMask;}\r

        TString   GetLHCPeriod() const {return fLHCPeriod;}\r
        TString   GetRunType() const {return fRunType;}\r
        TString   GetLHCState() const {return fLHCState;}\r
        TString   GetLHCPeriod() const {return fLHCPeriod;}\r
        TString   GetRunType() const {return fRunType;}\r
        TString   GetLHCState() const {return fLHCState;}\r


@@ -68,12 +73,11 @@ class AliGRPObject : public TObject {
        Float_t   GetDipoleCurrent(Stats stat) const {return fDipoleCurrent[stat];}\r
        Float_t*  GetCavernTemperature() const {return fCavernTemperature;}\r
        Float_t   GetCavernTemperature(Stats stat) const {return fCavernTemperature[stat];}\r
        Float_t   GetDipoleCurrent(Stats stat) const {return fDipoleCurrent[stat];}\r
        Float_t*  GetCavernTemperature() const {return fCavernTemperature;}\r
        Float_t   GetCavernTemperature(Stats stat) const {return fCavernTemperature[stat];}\r

-       //      Float_t*  GetCavernAtmosPressure() {return fCavernAtmosPressure;}\r
-       //Float_t   GetCavernAtmosPressure(Stats stat) const {return fCavernAtmosPressure[stat];}\r

        AliDCSSensor*   GetCavernAtmosPressure() const {return fCavernAtmosPressure;}\r
        AliDCSSensor*   GetCavernAtmosPressure() const {return fCavernAtmosPressure;}\r

+       AliDCSSensor*   GetCavernAtmosPressure2() const {return fCavernAtmosPressure2;}\r

        AliDCSSensor*   GetSurfaceAtmosPressure() const {return fSurfaceAtmosPressure;}\r
 \r
        AliDCSSensor*   GetSurfaceAtmosPressure() const {return fSurfaceAtmosPressure;}\r
 \r

-       Float_t* GetHallProbes(DP_HallProbes hp) const;\r
+       Float_t*  GetHallProbesArray(DP_HallProbes hp) const;\r

        Float_t   GetHallProbes(Int_t hp) const {return fHallProbes[hp];}\r
        Float_t   GetHallProbes(DP_HallProbes hp, Stats stat) const {return fHallProbes[hp*fPoints+stat];}\r
 \r
        Float_t   GetHallProbes(Int_t hp) const {return fHallProbes[hp];}\r
        Float_t   GetHallProbes(DP_HallProbes hp, Stats stat) const {return fHallProbes[hp*fPoints+stat];}\r
 \r


@@ -82,6 +86,8 @@ class AliGRPObject : public TObject {
 \r
        // setters\r
 \r
 \r
        // setters\r
 \r

+       void SetPolarityConventionLHC(Bool_t v=kTRUE) {return SetBit(kPolConvLHC,v);}\r
+       void SetUniformBMap(Bool_t v=kTRUE) {return SetBit(kUniformBMap,v);}\r

        void SetTimeStart(time_t timeStart)  {fTimeStart = timeStart;}\r
        void SetTimeEnd(time_t timeEnd)  {fTimeEnd = timeEnd;}\r
        void SetBeamEnergy(Float_t beamEnergy)  {fBeamEnergy = beamEnergy;}\r
        void SetTimeStart(time_t timeStart)  {fTimeStart = timeStart;}\r
        void SetTimeEnd(time_t timeEnd)  {fTimeEnd = timeEnd;}\r
        void SetBeamEnergy(Float_t beamEnergy)  {fBeamEnergy = beamEnergy;}\r


@@ -115,11 +121,8 @@ class AliGRPObject : public TObject {
                for (Int_t i = 0;i<fPoints;i++) fCavernTemperature[i] = cavernTemperature[i];\r
        }\r
        void SetCavernTemperature(Float_t cavernTemperature, Stats stat)  {fCavernTemperature[stat] = cavernTemperature;}\r
                for (Int_t i = 0;i<fPoints;i++) fCavernTemperature[i] = cavernTemperature[i];\r
        }\r
        void SetCavernTemperature(Float_t cavernTemperature, Stats stat)  {fCavernTemperature[stat] = cavernTemperature;}\r

-       //      void SetCavernAtmosPressure(Float_t* cavernAtmosPressure)  {\r
-       //              for (Int_t i = 0;i<fPoints;i++) fCavernAtmosPressure[i] = cavernAtmosPressure[i];\r
-       //}\r
-//     void SetCavernAtmosPressure(Float_t cavernAtmosPressure, Stats stat)  {fCavernAtmosPressure[stat] = cavernAtmosPressure;}\r

        void SetCavernAtmosPressure(AliDCSSensor* const cavernAtmosPressure)  {fCavernAtmosPressure = cavernAtmosPressure;}\r
        void SetCavernAtmosPressure(AliDCSSensor* const cavernAtmosPressure)  {fCavernAtmosPressure = cavernAtmosPressure;}\r

+       void SetCavernAtmosPressure2(AliDCSSensor* const cavernAtmosPressure)  {fCavernAtmosPressure2 = cavernAtmosPressure;}\r

        void SetSurfaceAtmosPressure(AliDCSSensor* const surfacePressure)  {fSurfaceAtmosPressure = surfacePressure;}\r
 \r
        void SetHallProbes(DP_HallProbes hp, Float_t hall_probe, Stats stat)  {fHallProbes[hp*fPoints+stat] = hall_probe;}\r
        void SetSurfaceAtmosPressure(AliDCSSensor* const surfacePressure)  {fSurfaceAtmosPressure = surfacePressure;}\r
 \r
        void SetHallProbes(DP_HallProbes hp, Float_t hall_probe, Stats stat)  {fHallProbes[hp*fPoints+stat] = hall_probe;}\r


@@ -180,9 +183,8 @@ class AliGRPObject : public TObject {
                                           // DipoleCurrent entry from DCS DB\r
        Float_t*  fCavernTemperature;     // [fPoints]\r
                                           // CavernTemperature entry from DCS DB\r
                                           // DipoleCurrent entry from DCS DB\r
        Float_t*  fCavernTemperature;     // [fPoints]\r
                                           // CavernTemperature entry from DCS DB\r

-       //      Float_t*  fCavernAtmosPressure;   // [fPoints]\r
-                                          // CavernAtmosPressure entry from DCS DB\r

        AliDCSSensor*  fCavernAtmosPressure;    // CavernAtmosPressure entry from DCS DB\r
        AliDCSSensor*  fCavernAtmosPressure;    // CavernAtmosPressure entry from DCS DB\r

+       AliDCSSensor*  fCavernAtmosPressure2;    // CavernAtmosPressure2 entry from DCS DB\r

        AliDCSSensor*  fSurfaceAtmosPressure;   // SurfaceAtmosPressure entry from DCS DB\r
 \r
        // Hall Probes\r
        AliDCSSensor*  fSurfaceAtmosPressure;   // SurfaceAtmosPressure entry from DCS DB\r
 \r
        // Hall Probes\r


@@ -190,7 +192,7 @@ class AliGRPObject : public TObject {
        Float_t* fHallProbes;       //[fDimension] \r
                                    // array containg the values for the Hall Probes\r
 \r
        Float_t* fHallProbes;       //[fDimension] \r
                                    // array containg the values for the Hall Probes\r
 \r

-       ClassDef(AliGRPObject,2)\r
+       ClassDef(AliGRPObject,3)\r

 \r
 };\r
 \r
 \r
 };\r
 \r