Moved AliLHCDipValT and AliLHCData to from STEERBase to STEER

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

diff --git a/STEER/AliGRPObject.cxx b/STEER/AliGRPObject.cxx
index c529ea765a38a30e86422d6b6bea15940d922740..32781f536738bcd3299616e8e651e947e9ee76d6 100644 (file)
--- a/STEER/AliGRPObject.cxx
+++ b/STEER/AliGRPObject.cxx
@@ -133,7 +133,7 @@ AliGRPObject::AliGRPObject():
 //-----------------------------------------------------------------------------\r
 \r
 AliGRPObject::AliGRPObject(const AliGRPObject &obj):\r
-       TObject(),\r
+       TObject(obj),\r
        fPoints(obj.fPoints),\r
        fDimension(obj.fDimension),\r
        fTimeStart(obj.fTimeStart),\r
@@ -165,6 +165,8 @@ AliGRPObject::AliGRPObject(const AliGRPObject &obj):
        // AliGRPObject copy ctor\r
        //\r
 \r
+       fHallProbes = new Float_t[fDimension]; \r
+\r
        for (Int_t nhp=0; nhp< fDimension; nhp++){\r
                fHallProbes[nhp] = obj.fHallProbes[nhp];\r
        }\r
@@ -188,6 +190,9 @@ AliGRPObject& AliGRPObject:: operator=(const AliGRPObject & obj)
        // AliGRPObject assignment operator\r
        //\r
 \r
+       if (&obj == this) return *this; \r
+\r
+       TObject::operator=(obj);\r
        this->fTimeStart = obj.GetTimeStart();\r
        this->fTimeEnd = obj.GetTimeEnd();\r
        this->fBeamEnergy = obj.GetBeamEnergy();\r
@@ -213,6 +218,7 @@ AliGRPObject& AliGRPObject:: operator=(const AliGRPObject & obj)
        this->fDipoleCurrent = new Float_t[fPoints];\r
        this->fCavernTemperature = new Float_t[fPoints];\r
        \r
+       if (this->fHallProbes==NULL) this->fHallProbes = new Float_t[this->fDimension]; \r
        for (Int_t nhp=0; nhp< fDimension; nhp++){\r
                this->fHallProbes[nhp] = obj.GetHallProbes(nhp);\r
 \r
@@ -327,7 +333,9 @@ void AliGRPObject::ReadValuesFromMap(const TMap* mapGRP){
        }\r
 \r
        if(mapGRP->GetValue("fAliceBeamEnergy")){\r
-               SetBeamEnergy((((TObjString*)(mapGRP->GetValue("fAliceBeamEnergy")))->GetString()).Atof());\r
+         double be = (((TObjString*)(mapGRP->GetValue("fAliceBeamEnergy")))->GetString()).Atof();\r
+         if (IsBeamEnergyIsSqrtSHalfGeV()) be/=2;   // old format was storig sqrt(s)\r
+         SetBeamEnergy(be);\r
        }\r
        else { \r
                AliError(Form("No fAliceBeamEnergy value found in GRP map!"));\r