Cast to AliMCParticle*

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

diff --git a/STEER/AliGRPObject.cxx b/STEER/AliGRPObject.cxx
index 6099c39ceb47172085d071d853cbb7bd85a527a2..bbcd70e436fbf5c7932a8aff4bfabb8031cc5974 100644 (file)
--- a/STEER/AliGRPObject.cxx
+++ b/STEER/AliGRPObject.cxx
@@ -31,7 +31,7 @@
 \r
 ClassImp(AliGRPObject)\r
        \r
-const Float_t AliGRPObject::fgkInvalidFloat = 0xffffffff; // value to identify invalid data - float\r
+const Float_t AliGRPObject::fgkInvalidFloat = 1E-33; // value to identify invalid data - float\r
 const TString AliGRPObject::fgkInvalidString = "";  // value to identify invalid data - string\r
 const Char_t AliGRPObject::fgkInvalidChar = -1;         // value to identify invalid data - uchar\r
 const Int_t AliGRPObject::fgkInvalidInt = -1;  // value to identify invalid data - uint\r
@@ -155,7 +155,6 @@ AliGRPObject::AliGRPObject(const AliGRPObject &obj):
        fL3Current(new Float_t[fPoints]),\r
        fDipoleCurrent(new Float_t[fPoints]),\r
        fCavernTemperature(new Float_t[fPoints]),\r
-       //fCavernAtmosPressure(new Float_t[fPoints]),\r
        fCavernAtmosPressure(obj.fCavernAtmosPressure),\r
        fSurfaceAtmosPressure(obj.fSurfaceAtmosPressure),\r
        fHallProbes(0x0)\r
@@ -176,8 +175,7 @@ AliGRPObject::AliGRPObject(const AliGRPObject &obj):
                fBeamIntensity[i] = obj.fBeamIntensity[i];\r
                fL3Current[i] = obj.fL3Current[i];\r
                fDipoleCurrent[i] = obj.fDipoleCurrent[i];\r
-               //fCavernTemperature[i] = obj.fCavernTemperature[i];\r
-               fCavernAtmosPressure[i] = obj.fCavernAtmosPressure[i];\r
+               fCavernTemperature[i] = obj.fCavernTemperature[i];\r
        }\r
 }\r
 \r
@@ -213,7 +211,6 @@ AliGRPObject& AliGRPObject:: operator=(const AliGRPObject & obj)
        this->fL3Current = new Float_t[fPoints];\r
        this->fDipoleCurrent = new Float_t[fPoints];\r
        this->fCavernTemperature = new Float_t[fPoints];\r
-       //this->fCavernAtmosPressure = new Float_t[fPoints];\r
        \r
        for (Int_t nhp=0; nhp< fDimension; nhp++){\r
                this->fHallProbes[nhp] = obj.GetHallProbes(nhp);\r
@@ -221,13 +218,11 @@ AliGRPObject& AliGRPObject:: operator=(const AliGRPObject & obj)
        }\r
        for (Int_t i = 0; i < fPoints; i++){\r
 \r
-               //              this->fBeamEnergy[i] = obj.GetBeamEnergy((Stats)i);\r
                this->fLHCLuminosity[i] = obj.GetLHCLuminosity((Stats)i);\r
                this->fBeamIntensity[i] = obj.GetBeamIntensity((Stats)i);\r
                this->fL3Current[i] = obj.GetL3Current((Stats)i);\r
                this->fDipoleCurrent[i] = obj.GetDipoleCurrent((Stats)i);\r
                this->fCavernTemperature[i] = obj.GetCavernTemperature((Stats)i);\r
-               //              this->fCavernAtmosPressure[i] = obj.GetCavernAtmosPressure((Stats)i);\r
        }\r
 \r
        return *this;\r
@@ -268,15 +263,14 @@ AliGRPObject::~AliGRPObject() {
 }\r
 \r
 //-----------------------------------------------------------------------------\r
-\r
-Float_t* AliGRPObject::GetHallProbes(DP_HallProbes hp) const {\r
+Float_t* AliGRPObject::GetHallProbesArray(DP_HallProbes hp) const {\r
 \r
        //\r
        // method to return array of statistical\r
         // variables for Hall Probe hp\r
        //\r
 \r
-       Float_t * array = new Float_t[fPoints];\r
+       Float_t* array = new Float_t[fPoints];\r
        Int_t shift = fPoints*(Int_t)hp; \r
        for (Int_t i=0;i<fPoints; i++){\r
 \r
@@ -286,7 +280,6 @@ Float_t* AliGRPObject::GetHallProbes(DP_HallProbes hp) const {
 \r
        return array;\r
 }\r
-\r
 //-------------------------------------------------------------------------------\r
 \r
 void AliGRPObject::SetHallProbes(DP_HallProbes hp, const Float_t* hall_probe){\r
@@ -417,14 +410,6 @@ void AliGRPObject::ReadValuesFromMap(const TMap* mapGRP){
        else { \r
                AliError(Form("No fCavernTemperature value found in GRP map!"));\r
        }\r
-       /*\r
-       if(mapGRP->GetValue("fCavernAtmosPressure")){\r
-               SetCavernAtmosPressure((Float_t)(((TObjString*)(mapGRP->GetValue("fCavernAtmosPressure")))->GetString()).Atof(),(Stats)0);\r
-       }       \r
-       else { \r
-               AliError(Form("No fCavernAtmosPressure value found in GRP map!"));\r
-       }\r
-       */\r
        if(mapGRP->GetValue("fCavernAtmosPressure")){\r
                AliInfo(Form("fCavernAtmosPressure found, but not ported to the new object since of a different type"));\r
        }       \r