Updates (Chiara)

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

diff --git a/STEER/AliGRPObject.h b/STEER/AliGRPObject.h
index e2f7e18f8a56064687048e9a91da795e4144a923..5383563cc99983caac5f365a644429cd8f4457f3 100644 (file)
--- a/STEER/AliGRPObject.h
+++ b/STEER/AliGRPObject.h
@@ -14,6 +14,7 @@
 \r
 #include <time.h>\r
 #include <TString.h>\r
+#include <TTimeStamp.h>\r
 \r
 class TMap;\r
 \r
@@ -52,7 +53,7 @@ class AliGRPObject : public TObject {
        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 IsBeamEnergyIsSqrtSHalfGeV() ? fBeamEnergy : fBeamEnergy/2;}\r
+       Float_t   GetBeamEnergy() const;\r
        TString   GetBeamType() const {return fBeamType;}\r
        Char_t    GetNumberOfDetectors() const {return fNumberOfDetectors;}\r
        UInt_t    GetDetectorMask() const {return fDetectorMask;}\r
@@ -73,6 +74,11 @@ class AliGRPObject : public TObject {
        AliDCSSensor*   GetCavernAtmosPressure() const {return fCavernAtmosPressure;}\r
        AliDCSSensor*   GetCavernAtmosPressure2() const {return fCavernAtmosPressure2;}\r
        AliDCSSensor*   GetSurfaceAtmosPressure() const {return fSurfaceAtmosPressure;}\r
+       AliDCSSensor*   GetBestCavernAtmosPressure() const ;\r
+       AliDCSSensor*   GetBestCavernAtmosPressure(const TTimeStamp& time) const;\r
+       static AliDCSSensor* GetBestCavernAtmosPressure(AliDCSSensor* cavern1, \r
+                          AliDCSSensor* cavern2, AliDCSSensor* surface, const TTimeStamp& time);\r
+\r
 \r
        Float_t*  GetHallProbesArray(DP_HallProbes hp) const;\r
        Float_t   GetHallProbes(Int_t hp) const {return fHallProbes[hp];}\r
@@ -136,6 +142,11 @@ class AliGRPObject : public TObject {
        static Int_t GetNumberOfHP() {return fgknDCSDPHallProbes;}\r
        static const char* GetHPDP(Int_t indexHP) {return fgkDCSDataPointsHallProbes[indexHP];}\r
 \r
+        Double_t EvalCavernPressure(const TTimeStamp& time, Bool_t& inside) const;\r
+       static Double_t EvalCavernPressure(AliDCSSensor* cavern1, \r
+                     AliDCSSensor* cavern2, AliDCSSensor* surface, \r
+                     const TTimeStamp& time, Bool_t& inside);\r
+\r
        // to read old GRP object in TMap format\r
 \r
        void ReadValuesFromMap(const TMap* map);        \r