X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=STEER%2FAliGRPObject.h;h=7acff8aee3f820613689a7e1c0a3c38431f354fc;hp=b5208993cf59042e61f3ac434d9f7adc3260db97;hb=c7f6296aba47aa4e09bc71a1cf0ebf3694282dfc;hpb=95eb6639b1137b31435a9c7516e9cc7cf03e3bd1

diff --git a/STEER/AliGRPObject.h b/STEER/AliGRPObject.h
index b5208993cf5..7acff8aee3f 100644
--- a/STEER/AliGRPObject.h
+++ b/STEER/AliGRPObject.h
@@ -13,6 +13,7 @@
 // 
 
 #include <time.h>
+#include <TString.h>
 
 class TMap;
 
@@ -24,6 +25,8 @@ class AliGRPObject : public TObject {
  public:
 
 	enum Stats {kMean = 0, kTruncMean = 1, kMedian = 2, kSDMean = 3, kSDMedian = 4};
+ 	
+ 	enum StatusBits {kPolConvLHC = BIT(14), kUniformBMap = BIT(15)};
 
 	enum DP_HallProbes { 
 		 khpL3bsf17H1= 0 , khpL3bsf17H2, khpL3bsf17H3, khpL3bsf17Temperature, 
@@ -45,6 +48,8 @@ class AliGRPObject : public TObject {
 
 	// getters
 
+ 	Bool_t    IsPolarityConventionLHC() const {return TestBit(kPolConvLHC);}
+ 	Bool_t    IsUniformBMap() const {return TestBit(kUniformBMap);}
 	time_t    GetTimeStart() const {return fTimeStart;}
 	time_t    GetTimeEnd() const {return fTimeEnd;}
 	Float_t   GetBeamEnergy() const {return fBeamEnergy;}
@@ -69,9 +74,10 @@ class AliGRPObject : public TObject {
 	Float_t*  GetCavernTemperature() const {return fCavernTemperature;}
 	Float_t   GetCavernTemperature(Stats stat) const {return fCavernTemperature[stat];}
 	AliDCSSensor*   GetCavernAtmosPressure() const {return fCavernAtmosPressure;}
+	AliDCSSensor*   GetCavernAtmosPressure2() const {return fCavernAtmosPressure2;}
 	AliDCSSensor*   GetSurfaceAtmosPressure() const {return fSurfaceAtmosPressure;}
 
-	Float_t*  GetHallProbes(DP_HallProbes hp) const;
+	Float_t*  GetHallProbesArray(DP_HallProbes hp) const;
 	Float_t   GetHallProbes(Int_t hp) const {return fHallProbes[hp];}
 	Float_t   GetHallProbes(DP_HallProbes hp, Stats stat) const {return fHallProbes[hp*fPoints+stat];}
 
@@ -80,6 +86,8 @@ class AliGRPObject : public TObject {
 
 	// setters
 
+ 	void SetPolarityConventionLHC(Bool_t v=kTRUE) {return SetBit(kPolConvLHC,v);}
+ 	void SetUniformBMap(Bool_t v=kTRUE) {return SetBit(kUniformBMap,v);}
 	void SetTimeStart(time_t timeStart)  {fTimeStart = timeStart;}
 	void SetTimeEnd(time_t timeEnd)  {fTimeEnd = timeEnd;}
 	void SetBeamEnergy(Float_t beamEnergy)  {fBeamEnergy = beamEnergy;}
@@ -114,6 +122,7 @@ class AliGRPObject : public TObject {
 	}
 	void SetCavernTemperature(Float_t cavernTemperature, Stats stat)  {fCavernTemperature[stat] = cavernTemperature;}
 	void SetCavernAtmosPressure(AliDCSSensor* const cavernAtmosPressure)  {fCavernAtmosPressure = cavernAtmosPressure;}
+	void SetCavernAtmosPressure2(AliDCSSensor* const cavernAtmosPressure)  {fCavernAtmosPressure2 = cavernAtmosPressure;}
 	void SetSurfaceAtmosPressure(AliDCSSensor* const surfacePressure)  {fSurfaceAtmosPressure = surfacePressure;}
 
 	void SetHallProbes(DP_HallProbes hp, Float_t hall_probe, Stats stat)  {fHallProbes[hp*fPoints+stat] = hall_probe;}
@@ -175,6 +184,7 @@ class AliGRPObject : public TObject {
 	Float_t*  fCavernTemperature;     // [fPoints]
                                           // CavernTemperature entry from DCS DB
 	AliDCSSensor*  fCavernAtmosPressure;    // CavernAtmosPressure entry from DCS DB
+	AliDCSSensor*  fCavernAtmosPressure2;    // CavernAtmosPressure2 entry from DCS DB
 	AliDCSSensor*  fSurfaceAtmosPressure;   // SurfaceAtmosPressure entry from DCS DB
 
 	// Hall Probes
@@ -182,7 +192,7 @@ class AliGRPObject : public TObject {
 	Float_t* fHallProbes;       //[fDimension] 
 	                            // array containg the values for the Hall Probes
 
-	ClassDef(AliGRPObject,2)
+	ClassDef(AliGRPObject,3)
 
 };