Removing LHC Luminosity and Beam Intensity from the GRP object.

diff --git a/STEER/AliGRPObject.cxx b/STEER/AliGRPObject.cxx
index cd760a56a5b606aa48c826eb36d51f30cde9c3f1..b8962436c6c1f015425b9a1bad43a15844652ce2 100644 (file)
--- a/STEER/AliGRPObject.cxx
+++ b/STEER/AliGRPObject.cxx
@@ -94,10 +94,6 @@ AliGRPObject::AliGRPObject():
        fLHCPeriod(fgkInvalidString),\r
        fRunType(fgkInvalidString),\r
        fLHCState(fgkInvalidString),\r
-       fLHCLuminosity(new Float_t[fPoints]),\r
-       fLHCLuminositySplineFit(0x0),\r
-       fBeamIntensity(new Float_t[fPoints]),\r
-       fBeamIntensitySplineFit(0x0),\r
        fL3Polarity(fgkInvalidChar),\r
        fDipolePolarity(fgkInvalidChar),\r
        fL3Current(new Float_t[fPoints]),\r
@@ -126,8 +122,6 @@ AliGRPObject::AliGRPObject():
 \r
        for (Int_t i = 0; i < fPoints; i++){\r
 \r
-               fLHCLuminosity[i] = fgkInvalidFloat;\r
-               fBeamIntensity[i] = fgkInvalidFloat;\r
                fL3Current[i] = fgkInvalidFloat;\r
                fDipoleCurrent[i] = fgkInvalidFloat;\r
                fCavernTemperature[i] = fgkInvalidFloat;\r
@@ -149,10 +143,6 @@ AliGRPObject::AliGRPObject(const AliGRPObject &obj):
        fLHCPeriod(obj.fLHCPeriod),\r
        fRunType(obj.fRunType),\r
        fLHCState(obj.fLHCState),\r
-       fLHCLuminosity(new Float_t[fPoints]),\r
-       fLHCLuminositySplineFit(obj.fLHCLuminositySplineFit),\r
-       fBeamIntensity(new Float_t[fPoints]),\r
-       fBeamIntensitySplineFit(obj.fBeamIntensitySplineFit),\r
        fL3Polarity(obj.fL3Polarity),\r
        fDipolePolarity(obj.fDipolePolarity),\r
        fL3Current(new Float_t[fPoints]),\r
@@ -181,8 +171,6 @@ AliGRPObject::AliGRPObject(const AliGRPObject &obj):
 \r
        for (Int_t i = 0; i < fPoints; i++){\r
 \r
-               fLHCLuminosity[i] = obj.fLHCLuminosity[i];\r
-               fBeamIntensity[i] = obj.fBeamIntensity[i];\r
                fL3Current[i] = obj.fL3Current[i];\r
                fDipoleCurrent[i] = obj.fDipoleCurrent[i];\r
                fCavernTemperature[i] = obj.fCavernTemperature[i];\r
@@ -210,8 +198,6 @@ AliGRPObject& AliGRPObject:: operator=(const AliGRPObject & obj)
        this->fLHCPeriod = obj.GetLHCPeriod();\r
        this->fRunType = obj.GetRunType();\r
        this->fLHCState = obj.GetLHCState();\r
-       this->fLHCLuminositySplineFit = obj.GetLHCLuminositySplineFit();\r
-       this->fBeamIntensitySplineFit = obj.GetBeamIntensitySplineFit();\r
        this->fL3Polarity = obj.GetL3Polarity();\r
        this->fDipolePolarity = obj.GetDipolePolarity();\r
        this->fCavernAtmosPressure = obj.GetCavernAtmosPressure();\r
@@ -220,8 +206,6 @@ AliGRPObject& AliGRPObject:: operator=(const AliGRPObject & obj)
        this->fPoints = obj.GetPoints();\r
        this->fDimension = obj.GetDimension();\r
 \r
-       this->fLHCLuminosity = new Float_t[fPoints];\r
-       this->fBeamIntensity = new Float_t[fPoints];\r
        this->fL3Current = new Float_t[fPoints];\r
        this->fDipoleCurrent = new Float_t[fPoints];\r
        this->fCavernTemperature = new Float_t[fPoints];\r
@@ -233,8 +217,6 @@ AliGRPObject& AliGRPObject:: operator=(const AliGRPObject & obj)
        }\r
        for (Int_t i = 0; i < fPoints; i++){\r
 \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
@@ -257,20 +239,10 @@ AliGRPObject::~AliGRPObject() {
 \r
        \r
        delete [] fHallProbes;\r
-       delete [] fLHCLuminosity;\r
-       delete [] fBeamIntensity;\r
        delete [] fL3Current;\r
        delete [] fDipoleCurrent;\r
        delete [] fCavernTemperature;\r
 \r
-       if (fLHCLuminositySplineFit){\r
-               delete fLHCLuminositySplineFit;\r
-               fLHCLuminositySplineFit = 0x0;\r
-       }\r
-       if (fBeamIntensitySplineFit){\r
-               delete fBeamIntensitySplineFit;\r
-               fBeamIntensitySplineFit = 0x0;\r
-       }\r
        if (fCavernAtmosPressure){\r
                delete fCavernAtmosPressure;\r
                fCavernAtmosPressure = 0x0;\r
@@ -397,15 +369,13 @@ void AliGRPObject::ReadValuesFromMap(const TMap* mapGRP){
                AliError(Form("No fLHCState value found in GRP map!"));\r
        }\r
        if(mapGRP->GetValue("fLHCluminosity")){\r
-               AliInfo(Form("fLHCLuminosity found, but porting only average to the new object, since the other values are not available in the old object"));\r
-               SetLHCLuminosity((Float_t)(((TObjString*)(mapGRP->GetValue("fLHCLuminosity")))->GetString()).Atof(),(Stats)0);\r
+               AliInfo(Form("fLHCLuminosity found, but not there anymore in the new object"));\r
        }       \r
        else { \r
                AliError(Form("No fLHCLuminosity value found in GRP map!"));\r
        }\r
        if(mapGRP->GetValue("fBeamIntensity")){\r
-               AliInfo(Form("fBeamIntensity found, but porting only average to the new object, since the other values are not available in the old object"));\r
-               SetBeamIntensity((Float_t)(((TObjString*)(mapGRP->GetValue("fBeamIntensity")))->GetString()).Atof(),(Stats)0);\r
+               AliInfo(Form("fBeamIntensity found, but not there anymore in the new object"));\r
        }       \r
        else { \r
                AliError(Form("No fBeamIntensity value found in GRP map!"));\r

diff --git a/STEER/AliGRPObject.h b/STEER/AliGRPObject.h
index 734ac8445037ecb9818d446ee643513a5ba53a01..e2f7e18f8a56064687048e9a91da795e4144a923 100644 (file)
--- a/STEER/AliGRPObject.h
+++ b/STEER/AliGRPObject.h
@@ -62,12 +62,6 @@ class AliGRPObject : public TObject {
        TString   GetMachineMode() const {return fMachineMode;}\r
        TObjArray*   GetLHCStateArray() const {return fLHCStateArray;}\r
        TObjArray*   GetMachineModeArray() const {return fMachineModeArray;}\r
-       Float_t*  GetLHCLuminosity() const {return fLHCLuminosity;}\r
-       Float_t   GetLHCLuminosity(Stats stat) const {return fLHCLuminosity[stat];}\r
-       AliSplineFit*  GetLHCLuminositySplineFit() const {return fLHCLuminositySplineFit;}\r
-       Float_t*  GetBeamIntensity() const {return fBeamIntensity;}\r
-       Float_t   GetBeamIntensity(Stats stat) const {return fBeamIntensity[stat];}\r
-       AliSplineFit*  GetBeamIntensitySplineFit() const {return fBeamIntensitySplineFit;}\r
        Char_t    GetL3Polarity() const {return fL3Polarity;}\r
        Char_t    GetDipolePolarity() const {return fDipolePolarity;}\r
        Float_t*  GetL3Current() const {return fL3Current;}\r
@@ -105,16 +99,6 @@ class AliGRPObject : public TObject {
        void SetMachineMode(TString machineMode)  {fMachineMode = machineMode;}\r
        void SetLHCStateArray(TObjArray* lhcStateArray)  {fLHCStateArray = lhcStateArray;}\r
        void SetMachineModeArray(TObjArray* machineModeArray)  {fMachineModeArray = machineModeArray;}\r
-       void SetLHCLuminosity(const Float_t* lhcLuminosity)  {\r
-               for (Int_t i = 0;i<fPoints;i++) fLHCLuminosity[i] = lhcLuminosity[i];\r
-       }\r
-       void SetLHCLuminosity(Float_t lhcLuminosity, Stats stat)  {fLHCLuminosity[stat] = lhcLuminosity;}\r
-       void SetLHCLuminositySplineFit(AliSplineFit* const lhcLuminositySplineFit)  {fLHCLuminositySplineFit = lhcLuminositySplineFit;}\r
-       void SetBeamIntensity(const Float_t* beamIntensity)  {\r
-               for (Int_t i = 0;i<fPoints;i++) fBeamIntensity[i] = beamIntensity[i];\r
-       }\r
-       void SetBeamIntensity(Float_t beamIntensity, Stats stat)  {fBeamIntensity[stat] = beamIntensity;}\r
-       void SetBeamIntensitySplineFit(AliSplineFit* const beamIntensitySplineFit)  {fBeamIntensitySplineFit = beamIntensitySplineFit;}\r
        void SetL3Polarity(Char_t l3Polarity)  {fL3Polarity = l3Polarity;}\r
        void SetDipolePolarity(Char_t dipolePolarity)  {fDipolePolarity = dipolePolarity;}\r
        void SetL3Current(const Float_t* l3Current)  {\r
@@ -178,12 +162,6 @@ class AliGRPObject : public TObject {
        TString  fLHCPeriod;              // LHCperiod entry from DAQ logbook \r
        TString  fRunType;                // RunType entry from DAQ logbook \r
        TString  fLHCState;               // LHCState entry from DCS DB\r
-       Float_t*  fLHCLuminosity;         // [fPoints]\r
-                                         // LHCLuminosity entry from DCS DB\r
-       AliSplineFit*  fLHCLuminositySplineFit;       // LHCLuminosity SplineFit from DCS DB\r
-       Float_t*  fBeamIntensity   ;      // [fPoints]\r
-                                         // BeamIntensity entry from DCS DB\r
-       AliSplineFit*  fBeamIntensitySplineFit;       // BeamIntensity SplineFit from DCS DB\r
        Char_t    fL3Polarity;            // L3Polarity entry from DCS DB\r
        Char_t    fDipolePolarity;        // DipolePolarity entry from DCS DB                                     \r
        Float_t*  fL3Current;             // [fPoints]\r
@@ -208,7 +186,7 @@ class AliGRPObject : public TObject {
 \r
        Double_t fMaxTimeLHCValidity;    // time until which the LHC Data Machine Mode and Beam Mode didn't change \r
 \r
-       ClassDef(AliGRPObject,5)\r
+       ClassDef(AliGRPObject,6)\r
 \r
 };\r
 \r

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index ac62b3bb7e913ad05e69cf6c516ba13f317777cb..215449a24b0c080b5071a497c6c38898c52c561b 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -2276,8 +2276,6 @@ void AliSimulation::WriteGRPEntry()
   grpObj->SetDetectorMask((Int_t)detectorPattern);
   grpObj->SetLHCPeriod("LHC08c");
   grpObj->SetLHCState("STABLE_BEAMS");
-  grpObj->SetLHCLuminosity(0,(AliGRPObject::Stats)0);
-  grpObj->SetBeamIntensity(0,(AliGRPObject::Stats)0);
   //
   AliMagF *field = (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
   Float_t solenoidField = field ? TMath::Abs(field->SolenoidField()) : 0;