]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/AliGRPPreprocessor.cxx
Bug fix (partially masked by previos bug) + modifications in printout - to be clearer.
[u/mrichter/AliRoot.git] / STEER / AliGRPPreprocessor.cxx
index 14b338141049f8f511bf3b45ba419cc3d4dec075..ae35429dc85b915e5373936e97d1834b96d1a871 100644 (file)
 //                  Global Run Parameters (GRP) preprocessor
 //    Origin: Panos Christakoglou, UOA-CERN, Panos.Christakoglou@cern.ch
 //    Modified: Ernesto.Lopez.Torres@cern.ch  CEADEN-CERN
+//    Modified: Chiara.Zampolli@cern.ch  CERN
 //-------------------------------------------------------------------------
 
 #include <TChain.h>
 #include <TList.h>
 #include <TMap.h>
 #include <TObjString.h>
-#include <TTimeStamp.h>
-#include <TSystem.h>
-#include <TFile.h>
-#include <TParameter.h>
 #include <TGraph.h>
 
+#include <float.h>
+
 #include "AliGRPPreprocessor.h"
-#include "AliGRPDCS.h"
 #include "AliGRPObject.h"
 #include "AliDCSSensor.h"
 #include "AliSplineFit.h"
 #include "AliDCSSensorArray.h"
+//#include "AliRawEventHeaderVersions.h"
 
 #include "AliTriggerConfiguration.h"
 #include "AliTriggerRunScalers.h"
@@ -48,9 +47,8 @@
 class AliDCSValue;
 class AliShuttleInterface;
 
-#include <TH1.h>
-
 // needed for ReceivePromptRecoParameters
+
 #include <TSQLServer.h>
 #include <TSQLResult.h>
 #include <TSQLRow.h>
@@ -65,9 +63,10 @@ ClassImp(AliGRPPreprocessor)
 
 //_______________________________________________________________
 
-  const Int_t AliGRPPreprocessor::fgknDAQLbPar = 8; // num parameters in the logbook
+  const Int_t AliGRPPreprocessor::fgknDAQLbPar = 8; // num parameters in the logbook for PHYSICS runs, when beamType from DAQ logbook != Cosmics
+  const Int_t AliGRPPreprocessor::fgknDAQLbParReduced = 7; // num parameters in the logbook for the other cases
   const Int_t AliGRPPreprocessor::fgknDCSDP = 50;   // number of dcs dps
-  const Int_t AliGRPPreprocessor::fgknDCSDP_HallProbes = 40;   // number of dcs dps
+  const Int_t AliGRPPreprocessor::fgknDCSDPHallProbes = 40;   // number of dcs dps
   const char* AliGRPPreprocessor::fgkDCSDataPoints[AliGRPPreprocessor::fgknDCSDP] = {
                    "LHCState",              // missing in DCS
                    "L3Polarity",
@@ -121,7 +120,7 @@ ClassImp(AliGRPPreprocessor)
                    "SurfaceAtmosPressure"
                  };
 
-  const char* AliGRPPreprocessor::fgkDCSDataPoints_HallProbes[AliGRPPreprocessor::fgknDCSDP_HallProbes] = {
+  const char* AliGRPPreprocessor::fgkDCSDataPointsHallProbes[AliGRPPreprocessor::fgknDCSDPHallProbes] = {
                   "L3_BSF17_H1",
                   "L3_BSF17_H2",
                   "L3_BSF17_H3",
@@ -186,17 +185,51 @@ ClassImp(AliGRPPreprocessor)
                    "(DAQ FXS ERROR)",
                    "(DCS FXS ERROR)",
                    "(DCS data points ERROR)",
-                   "(Trigger Configuration ERROR)"
+                   "(Trigger Configuration ERROR)",
+                   "(DAQ logbook ERROR determining partition of the run)"
   };
 
 //_______________________________________________________________
 
 AliGRPPreprocessor::AliGRPPreprocessor(AliShuttleInterface* shuttle):
-       AliPreprocessor("GRP",shuttle),  fPressure(0)
+       AliPreprocessor("GRP",shuttle),  fPressure(0), fmaxFloat(0), fminFloat(0),fmaxDouble(0), fminDouble(0), fmaxInt(0), fminInt(0), fmaxUInt(0), fminUInt(0)
 {
        // constructor - shuttle must be instantiated!
 
+       AddRunType("COSMIC");
+       AddRunType("LASER");
        AddRunType("PHYSICS");
+       AddRunType("CALIBRATION_BC");
+       AddRunType("CALIBRATION_CENTRAL");
+       AddRunType("CALIBRATION_EMD");
+       AddRunType("CALIBRATION_MB");
+       AddRunType("CALIBRATION_SEMICENTRAL");
+       AddRunType("CALIBRATION");
+       AddRunType("PEDESTAL");
+       AddRunType("STANDALONE");
+       AddRunType("GAIN");
+       AddRunType("NOISE");
+       AddRunType("PULSER");
+        AddRunType("STANDALONE_PULSER");
+
+       fmaxFloat = FLT_MAX;
+       fminFloat = -FLT_MAX;
+       fmaxDouble = DBL_MAX;
+       fminDouble = -DBL_MAX;
+       fmaxInt = kMaxInt;
+       fminInt = kMinInt;
+       fmaxUInt = kMaxUInt;
+       fminUInt = 0;
+
+       AliInfo(Form("Max allowed float = %6.5e",fmaxFloat));
+       AliInfo(Form("Min allowed float = %6.5e",fminFloat));
+       AliInfo(Form("Max allowed double = %6.5e",fmaxDouble));
+       AliInfo(Form("Min allowed double = %6.5e",fminDouble));
+       AliInfo(Form("Max allowed integer = %d",fmaxInt));
+       AliInfo(Form("Min allowed integer = %d",fminInt));
+       AliInfo(Form("Max allowed unsigned integer = %u",(Int_t)fmaxUInt));
+       AliInfo(Form("Min allowed unsigned integer = %u",(Int_t)fminUInt));
+
 }
 
 //_______________________________________________________________
@@ -217,6 +250,8 @@ void AliGRPPreprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTime)
   AliPreprocessor::Initialize(run, startTime, endTime);
 
   AliInfo("Initialization of the GRP preprocessor.");
+  AliInfo(Form("Start Time DCS = %d",GetStartTimeDCSQuery()));
+  AliInfo(Form("End Time DCS = %d",GetEndTimeDCSQuery()));
   TClonesArray * array = new TClonesArray("AliDCSSensor",kNumSensors); 
   for(Int_t j = 0; j < kNumSensors; j++) {
     AliDCSSensor * sens = new ((*array)[j])AliDCSSensor;
@@ -224,7 +259,6 @@ void AliGRPPreprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTime)
   }
   AliInfo(Form("Pressure Entries: %d",array->GetEntries()));
 
-  //  fPressure = new AliDCSSensorArray(fStartTime, fEndTime, array);
   fPressure = new AliDCSSensorArray(GetStartTimeDCSQuery(), GetEndTimeDCSQuery(), array);
 }
 
@@ -234,6 +268,13 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
 {
        // process data retrieved by the Shuttle
        
+       // retrieving "partition" and "detector" fields from DAQ logbook to 
+       // determine the partition in which the run was taken
+       // the partition is used to decide how to react in case of errors for CTP
+
+       TString partition = (TString)GetRunParameter("partition");  
+       TString detector = (TString)GetRunParameter("detector");   
+
        AliGRPObject *grpobj = new AliGRPObject();  // object to store data
 
        //=================//
@@ -241,7 +282,15 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        //=================//
        UInt_t error = 0;
        
-       grpobj = ProcessDaqLB();
+       Int_t iDaqLB = ProcessDaqLB(grpobj);
+       TString runType = (TString)GetRunType();
+       TString beamType = (TString)GetRunParameter("beamType");
+       if((runType == "PHYSICS" && iDaqLB == fgknDAQLbPar && beamType!="Cosmics") ||  (runType == "PHYSICS" && iDaqLB == fgknDAQLbParReduced && beamType=="Cosmics") || (runType != "PHYSICS" && iDaqLB == fgknDAQLbParReduced)) {
+               Log(Form("DAQ Logbook, successful!"));
+       } else {
+               Log(Form("DAQ Logbook, could not get all expected entries!!!"));
+               error |= 1;
+       }
 
        //=================//
        // DAQ FXS         //
@@ -257,85 +306,102 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        //=================//
        // DCS FXS         //
        //=================//
-       UInt_t iDcsFxs = ProcessDcsFxs();
+       UInt_t iDcsFxs = ProcessDcsFxs(partition, detector);
        if( iDcsFxs == 0 ) {
                Log(Form("DCS FXS, successful!"));
-       } else {
-               Log(Form("DCS FXS, Could not store CTP run configuration and scalers!!!"));
+       } else  if (iDcsFxs ==1) {
+               Log(Form("DCS FXS, Could not store CTP scalers!!!"));
                error |= 4;
+       } else{
+               Log(Form("Incorrect field in DAQ logbook for partition = %s and detector = %s, going into error without CTP scalers...",partition.Data(),detector.Data()));
+               error |= 32;
        }
        
        //=================//
        // DCS data points //
        //=================//
+       Log(Form("Starting DCS Query at %d and finishing at %d",GetStartTimeDCSQuery(),GetEndTimeDCSQuery()));
        Int_t entries = ProcessDcsDPs( valueMap, grpobj );
-       if( entries < fgknDCSDP-3 ) { // FIXME (!= ) LHState and pressure map are not working yet...
-               Log(Form("Problem with the DCS data points!!!"));
+       Log(Form("entries found = %d (should be %d)",entries, fgknDCSDP-4));
+       if( entries < fgknDCSDP-4 ) { // FIXME (!= ) LHState, LHCLuminosity, BeamIntensity, LH3_BSF4_H3 are not working yet...  
+               Log(Form("Problem with the DCS data points!!! Only %d/%d entries found",entries,fgknDCSDP-4));
                error |= 8;
        } else  Log(Form("DCS data points, successful!"));
        
        //=======================//
        // Trigger Configuration //
        //=======================//
-       // either from DAQ logbook.....
+
        const char * triggerConf = GetTriggerConfiguration();
-       if (triggerConf!= NULL) {
-               Log("Found trigger configuration in DAQ logbook");
-               AliTriggerConfiguration *runcfg = AliTriggerConfiguration::LoadConfigurationFromString(triggerConf);      
-               if (!runcfg) {
-                       Log("Bad CTP run configuration file from DAQ logbook! The corresponding CDB entry will not be filled!");
+
+       if (partition.IsNull() && !detector.IsNull()){ // standalone partition
+               Log("STANDALONE partition for current run, using Trigger Configuration dummy value");
+               AliCDBEntry *cdbEntry = GetFromOCDB("CTP","DummyConfig");
+               if (!cdbEntry) {
+                       Log(Form("No dummy CTP configuration entry found, going into error..."));
                        error |= 16;
                }
-               else {
-                       TString titleCTPcfg = Form("CTP cfg for run %i from DAQ",fRun);
-                       runcfg->SetTitle(titleCTPcfg);
-                       AliCDBMetaData metaData;
-                       metaData.SetBeamPeriod(0);
-                       metaData.SetResponsible("Roman Lietava");
-                       metaData.SetComment("CTP run configuration from DAQ logbook");
-                       if (!Store("CTP","Config", runcfg, &metaData, 0, 0)) {
-                               Log("Unable to store the CTP run configuration object to OCDB!");
+               else{
+                       AliTriggerConfiguration *runcfg = (AliTriggerConfiguration*)cdbEntry->GetObject();
+                       if (!runcfg){
+                               Log(Form("dummy CTP config not found in OCDB entry, going into error..."));
                                error |= 16;
                        }
+                       else {
+                               TString titleCTPcfg = Form("CTP cfg for run %i from Dummy entry in OCDB",fRun);
+                               runcfg->SetTitle(titleCTPcfg);
+                               AliCDBMetaData metaData;
+                               metaData.SetResponsible("Roman Lietava");
+                               metaData.SetComment("CTP run configuration from dummy entry in OCDB");
+                               if (!Store("CTP","Config", runcfg, &metaData, 0, 0)) {
+                                       Log("Unable to store the dummy CTP run configuration object to OCDB!");
+                                       error |= 16;
+                               }
+                       }
                }
        }
-       /*  the DCS should not been used any more to access this stuff!!!
-       // ...or from DCS FXS
-       else{
-               Log("No trigger configuration found in the DAQ logbook!! Trying reading from DCS FXS...");
-               TString runcfgfile = GetFile(kDCS, "CTP_runconfig", "");
-               if (runcfgfile.IsNull()) {
-                       Log("No CTP runconfig files has been found in DCS FXS!");
-                       error |= 16;
-               }
-               else {
-                       Log(Form("File with Id CTP_runconfig found! Copied to %s",runcfgfile.Data()));
-                       AliTriggerConfiguration *runcfg = AliTriggerConfiguration::LoadConfiguration(runcfgfile);
+
+       else if (!partition.IsNull() && detector.IsNull()){ // global partition
+               Log("GLOBAL partition for current run, using Trigger Configuration from DAQ Logbook");
+               if (triggerConf!= NULL) {
+                       Log("Found trigger configuration in DAQ logbook");
+                       AliTriggerConfiguration *runcfg = AliTriggerConfiguration::LoadConfigurationFromString(triggerConf);      
                        if (!runcfg) {
-                               Log("Bad CTP run configuration file from DCS FXS! The corresponding CDB entry will not be filled!");
-                               error |= 16;;
+                               Log("Bad CTP run configuration file from DAQ logbook! The corresponding CDB entry will not be filled!");
+                               error |= 16;
                        }
                        else {
-                               TString titleCTPcfg = Form("CTP cfg for run %i from DCS",fRun);
+                               TString titleCTPcfg = Form("CTP cfg for run %i from DAQ",fRun);
                                runcfg->SetTitle(titleCTPcfg);
                                AliCDBMetaData metaData;
                                metaData.SetBeamPeriod(0);
                                metaData.SetResponsible("Roman Lietava");
-                               metaData.SetComment("CTP run configuration from DCS FXS");
+                               metaData.SetComment("CTP run configuration from DAQ logbook");
                                if (!Store("CTP","Config", runcfg, &metaData, 0, 0)) {
                                        Log("Unable to store the CTP run configuration object to OCDB!");
                                        error |= 16;
                                }
                        }
                }
+
+               else {
+                       Log("Trigger configuration NULL in DAQ logbook");
+                       error |= 16;
+               }
        }
-       */
+
+       else {
+               Log(Form("Incorrect field in DAQ logbook for partition = %s and detector = %s, going into error without trigger configuration...",partition.Data(),detector.Data()));
+               error |= 32;
+       }
+
+       // storing AliGRPObject in OCDB
+
        AliCDBMetaData md;
-       md.SetResponsible("Ernesto Lopez Torres");
+       md.SetResponsible("Chiara Zampolli");
        md.SetComment("Output parameters from the GRP preprocessor.");
        
        Bool_t result = kTRUE;
-       Log("Before storing");
        result = Store("GRP", "Data", grpobj, &md); 
        delete grpobj;
        
@@ -343,12 +409,13 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
                Log("GRP Preprocessor Success");
                return 0;
        } else {
-               Log( Form("GRP Preprocessor FAILS!!! %s%s%s%s%s",
+               Log( Form("GRP Preprocessor FAILS!!! %s%s%s%s%s%s",
                          kppError[(error&1)?1:0],
                          kppError[(error&2)?2:0],
                          kppError[(error&4)?3:0],
                          kppError[(error&8)?4:0],
-                         kppError[(error&16)?5:0]
+                         kppError[(error&16)?5:0],
+                         kppError[(error&32)?6:0]
                          ));
                return error;
        }
@@ -356,24 +423,24 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
 
 //_______________________________________________________________
 
-AliGRPObject* AliGRPPreprocessor::ProcessDaqLB()
+Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
 {
        //Getting the DAQ lb information
        
-       time_t timeStart         = (time_t)(((TString)GetRunParameter("DAQ_time_start")).Atoi());
-       time_t timeEnd         = (time_t)(((TString)GetRunParameter("DAQ_time_end")).Atoi());
-       Float_t beamEnergy         = (Float_t)(((TString)GetRunParameter("beamEnergy")).Atof());
+       time_t timeStart = (time_t)(((TString)GetRunParameter("DAQ_time_start")).Atoi());
+       time_t timeEnd = (time_t)(((TString)GetRunParameter("DAQ_time_end")).Atoi());
+       Float_t beamEnergy = (Float_t)(((TString)GetRunParameter("beamEnergy")).Atof());
        TString beamType = (TString)GetRunParameter("beamType");
        Char_t numberOfDetectors = (Char_t)(((TString)GetRunParameter("numberOfDetectors")).Atoi());
-       UInt_t  detectorMask= (UInt_t)(((TString)GetRunParameter("detectorMask")).Atoi());
+       UInt_t  detectorMask = (UInt_t)(((TString)GetRunParameter("detectorMask")).Atoi());
        TString lhcPeriod = (TString)GetRunParameter("LHCperiod");
        TString runType = (TString)GetRunType();
 
-       AliGRPObject* grpObj = new AliGRPObject();
-
+       UInt_t nparameter = 0;
        if (timeStart != 0){
                grpObj->SetTimeStart(timeStart);
                Log(Form("Start time for run %d: %d",fRun, (Int_t)timeStart));
+               nparameter++;
        } 
        else {
                Log(Form("Start time not put in logbook, setting to invalid in GRP entry!"));
@@ -382,6 +449,7 @@ AliGRPObject* AliGRPPreprocessor::ProcessDaqLB()
        if (timeEnd != 0){
                grpObj->SetTimeEnd(timeEnd);
                Log(Form("End time for run %d: %i",fRun, (Int_t)timeEnd));
+               nparameter++;
        } 
        else {
                Log(Form("End time not put in logbook, setting to invalid in GRP entry!"));
@@ -390,16 +458,24 @@ AliGRPObject* AliGRPPreprocessor::ProcessDaqLB()
        if (beamEnergy != 0){
                grpObj->SetBeamEnergy(beamEnergy);
                Log(Form("Beam Energy for run %d: %f",fRun, beamEnergy));
+               if ((runType == "PHYSICS" && beamType!="Cosmics")){
+                       nparameter++; // increasing nparameters only in case we're in PHYSICS runs with beamType != Cosmics
+               }
        } 
        else {
-               Log(Form("Beam Energy not put in logbook, setting to invalid in GRP entry!"));
+               if ((runType == "PHYSICS" && beamType!="Cosmics")){
+                       Log(Form("Beam Energy not put in logbook, setting to invalid in GRP entry, and producing an error (beamType = %s, runType = %s)",beamType.Data(), runType.Data()));
+               }
+               else{
+                       Log(Form("Beam Energy not put in logbook, setting to invalid in GRP entry, but not producing any error (beamType = %s, runType = %s)",beamType.Data(), runType.Data()));
+               }
        }
 
-               Log(Form("Beam Type for run %d: %s",fRun, beamType.Data()));
                
        if (beamType.Length() != 0){
                grpObj->SetBeamType(beamType);
                Log(Form("Beam Type for run %d: %s",fRun, beamType.Data()));
+               nparameter++; 
        } 
        else {
                Log(Form("Beam Type not put in logbook, setting to invalid in GRP entry!"));
@@ -408,6 +484,7 @@ AliGRPObject* AliGRPPreprocessor::ProcessDaqLB()
        if (numberOfDetectors != 0){
                grpObj->SetNumberOfDetectors(numberOfDetectors);
                Log(Form("Number Of Detectors for run %d: %d",fRun, (Int_t)numberOfDetectors));
+               nparameter++;
        } 
        else {
                Log(Form("Number Of Detectors not put in logbook, setting to invalid in GRP entry!"));
@@ -416,6 +493,7 @@ AliGRPObject* AliGRPPreprocessor::ProcessDaqLB()
        if (detectorMask != 0){
                grpObj->SetDetectorMask(detectorMask);
                Log(Form("Detector Mask for run %d: %d",fRun, detectorMask));
+               nparameter++;
        } 
        else {
                Log(Form("Detector Mask not put in logbook, setting to invalid in GRP entry!"));
@@ -424,17 +502,21 @@ AliGRPObject* AliGRPPreprocessor::ProcessDaqLB()
        if (lhcPeriod.Length() != 0) {
                grpObj->SetLHCPeriod(lhcPeriod);
                Log(Form("LHC period (DAQ) for run %d: %s",fRun, lhcPeriod.Data()));
-       } else {
+               nparameter++;
+       } 
+       else {
                Log(Form("LHCperiod not put in logbook, setting to invalid in GRP entry!"));
        }
        if (runType.Length() != 0) {
                grpObj->SetRunType(runType);
                Log(Form("Run Type (DAQ) for run %d: %s",fRun, runType.Data()));
-       } else {
+               nparameter++;
+       } 
+       else {
                Log(Form("Run Type not put in logbook, setting to invalid in GRP entry!"));
        }
 
-       return grpObj;
+       return nparameter;
 }
 
 //_______________________________________________________________
@@ -443,6 +525,7 @@ UInt_t AliGRPPreprocessor::ProcessDaqFxs()
 {
        //======DAQ FXS======//
        
+       //      AliRawEventHeaderV3_9::Class()->IgnoreTObjectStreamer(); // to avoid trying reading TObject store in AliRawEventHeaderV3_9 - temporary fix 
        TList* list = GetFileSources(kDAQ);  
        if (!list) {
                Log("No raw data tag list: connection problems with DAQ FXS logbook!");
@@ -493,12 +576,12 @@ UInt_t AliGRPPreprocessor::ProcessDaqFxs()
        
        TString fRawDataFileName = "GRP_Merged.tag.root";
        Log(Form("Merging %d raw data tags into file: %s", nFiles, fRawDataFileName.Data()));
-       /* temporary, to speed up
+       
        if( fRawTagChain->Merge(fRawDataFileName) < 1 ) {
                Log("Error merging raw data files!!!");
                return 3;
        }
-       */
+       
        TString outputfile = Form("Run%d.Merged.RAW.tag.root", fRun);
        Bool_t result = StoreRunMetadataFile(fRawDataFileName.Data(),outputfile.Data());
        
@@ -521,51 +604,75 @@ UInt_t AliGRPPreprocessor::ProcessDaqFxs()
 }
 
 //_______________________________________________________________
-UInt_t AliGRPPreprocessor::ProcessDcsFxs()
+UInt_t AliGRPPreprocessor::ProcessDcsFxs(TString partition, TString detector)
 {
-       {
-               // Get the CTP counters information
-               TList* list = GetFileSources(kDCS,"CTP_xcounters");  
-               if (!list) {
-                       Log("No CTP counters file: connection problems with DAQ FXS logbook!");
+
+       // processing the info
+       // stored in the DCS FXS
+       // coming from the trigger
+
+       // Get the CTP counters information
+
+       if (partition.IsNull() && !detector.IsNull()){ // standalone partition
+               Log("STANDALONE partition for current run, using Trigger Configuration dummy value");
+               AliCDBEntry *cdbEntry = GetFromOCDB("CTP","DummyScalers");
+               if (!cdbEntry) {
+                       Log(Form("No dummy CTP scalers entry found, going into error..."));
                        return 1;
                }
-               
-               if (list->GetEntries() == 0) {
-                       Log("No CTP counters file to be processed!");
+               else{
+                       AliTriggerRunScalers *scalers = (AliTriggerRunScalers*)cdbEntry->GetObject();
+                       if (!scalers){
+                               Log(Form("CTP dummy scalers not found in OCDB entry, going into error..."));
+                               return 1;
+                       }
+                       else {
+                               AliCDBMetaData metaData;
+                               metaData.SetResponsible("Roman Lietava");
+                               metaData.SetComment("CTP scalers from dummy entry in OCDB");
+                               if (!Store("CTP","Scalers", scalers, &metaData, 0, 0)) {
+                                       Log("Unable to store the dummy CTP scalers object to OCDB!");
+                                       return 1;
+                               }
+                       }
+               }
+       }
+
+       else if (!partition.IsNull() && detector.IsNull()){ // global partition
+               Log("GLOBAL partition for current run, using CTP scalers from DCS FXS");
+               TString countersfile = GetFile(kDCS, "CTP_xcounters","");
+               if (countersfile.IsNull()) {
+                       Log("No CTP counters files has been found: empty source!");
                        return 1;
                }
                else {
-                       TIter iter(list);
-                       TObjString *source;
-                       while ((source = dynamic_cast<TObjString *> (iter.Next()))) {
-                               TString countersfile = GetFile(kDCS, "CTP_xcounters", source->GetName());
-                               if (countersfile.IsNull()) {
-                                       Log("No CTP counters files has been found: empty source!");
-                               }
-                               else {
-                                       Log(Form("File with Id CTP_xcounters found in source %s! Copied to %s",source->GetName(),countersfile.Data()));
-                                       AliTriggerRunScalers *scalers = AliTriggerRunScalers::ReadScalers(countersfile);
-                                       if (!scalers) {
-                                               Log("Bad CTP counters file! The corresponding CDB entry will not be filled!");
-                                               return 1;
-                                       }
-                                       else {
-                                               AliCDBMetaData metaData;
-                                               metaData.SetBeamPeriod(0);
-                                               metaData.SetResponsible("Roman Lietava");
-                                               metaData.SetComment("CTP scalers");
-                                               if (!Store("CTP","Scalers", scalers, &metaData, 0, 0)) {
-                                                       Log("Unable to store the CTP scalers object to OCDB!");
-                                               }
-                                       }
+                       Log(Form("File with Id CTP_xcounters found in DCS FXS! Copied to %s",countersfile.Data()));
+                       AliTriggerRunScalers *scalers = AliTriggerRunScalers::ReadScalers(countersfile);
+                       if (!scalers) {
+                               Log("Bad CTP counters file! The corresponding CDB entry will not be filled!");
+                               return 1;
+                       }
+                       else {
+                               AliCDBMetaData metaData;
+                               metaData.SetBeamPeriod(0);
+                               metaData.SetResponsible("Roman Lietava");
+                               metaData.SetComment("CTP scalers");
+                               if (!Store("CTP","Scalers", scalers, &metaData, 0, 0)) {
+                                       Log("Unable to store the CTP scalers object to OCDB!");
+                                       return 1;
                                }
                        }
                }
-               delete list;
        }
        
+
+       else{   
+               Log(Form("Incorrect field in DAQ logbook for partition = %s and detector = %s, going into error...",partition.Data(),detector.Data()));
+               return 2;
+       }
+
        return 0;
+
 }
 //_______________________________________________________________
 
@@ -576,7 +683,7 @@ Int_t AliGRPPreprocessor::ProcessDcsDPs(TMap* valueMap, AliGRPObject* grpObj)
        // processing DCS DPs
        //
 
-       Int_t entries = 0;
+       Int_t entries = 0;  // counting the entries that are in the DCS DB, not taking care whether they have values or not
        Int_t nLHCEntries = 0;
        Int_t nL3Entries = 0;
        Int_t nDipoleEntries = 0;
@@ -595,37 +702,73 @@ Int_t AliGRPPreprocessor::ProcessDcsDPs(TMap* valueMap, AliGRPObject* grpObj)
 
 //_______________________________________________________________
 
-Int_t AliGRPPreprocessor::ProcessL3DPs(TMap* valueMap, AliGRPObject* grpObj)
+Int_t AliGRPPreprocessor::ProcessL3DPs(const TMap* valueMap, AliGRPObject* grpObj)
 {
+
+       // processing DPs
+       // related to 
+       // L3 info
+
        Int_t nL3Entries = 0;
        TObjArray *array = 0x0;
        Int_t indexDP = -1;
+       Bool_t isZero = kTRUE; // flag to monitor L3Current. If set to true, the magnet is OFF, and the polarity can change
 
-       AliInfo(Form("==========L3Polarity==========="));
-       indexDP = kL3Polarity;
+       AliInfo(Form("==========L3Current==========="));
+       Bool_t outOfRange = kFALSE;  // flag to monitor if any value collected by DCS is out of range
+       indexDP = kL3Current;
        array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
        if(!array) {
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               Char_t charDCS = ProcessBool(array);
-               grpObj->SetL3Polarity(charDCS);
-               nL3Entries++;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Float_t *floatDCS = ProcessFloatAllMagnet(array, indexDP, isZero);
+                       if (floatDCS != NULL){
+                               grpObj->SetL3Current(floatDCS);
+                       }
+                       else{
+                               outOfRange = kTRUE;
+                       }       
+                       if (floatDCS){
+                               delete[] floatDCS;
+                               floatDCS = 0x0;
+                       }
+               }
+               if (!outOfRange) nL3Entries++;
        }
 
        if (array) array = 0x0;
 
-       AliInfo(Form("==========L3Current==========="));
-       indexDP = kL3Current;
+       AliInfo(Form("==========L3Polarity==========="));
+       indexDP = kL3Polarity;
        array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
        if(!array) {
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               Float_t *floatDCS = ProcessFloatAll(array);
-               grpObj->SetL3Current(floatDCS);
-               delete floatDCS;
-               nL3Entries++;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s Polarity to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Bool_t change = kFALSE;
+                       Char_t charDCS = ProcessBool(array,change);
+                       if (!change){
+                               grpObj->SetL3Polarity(charDCS);
+                               AliInfo(Form("%s set to %d",fgkDCSDataPoints[indexDP],(Int_t)(grpObj->GetL3Polarity())));
+                               nL3Entries++;
+                       }
+                       else if (isZero){
+                               AliInfo(Form("%s set to invalid, but magnet was OFF (according to the current), DP not considered wrong",fgkDCSDataPoints[indexDP]));
+                               nL3Entries++;
+                       }
+                       else {
+                               AliError(Form("%s value changed within the run, while the magnet was ON (according to the current), setting it to invalid and considering the DP as wrong",fgkDCSDataPoints[indexDP]));
+                       }
+               }
        }
 
        return nL3Entries;
@@ -633,39 +776,72 @@ Int_t AliGRPPreprocessor::ProcessL3DPs(TMap* valueMap, AliGRPObject* grpObj)
 }
 //_______________________________________________________________
 
-Int_t AliGRPPreprocessor::ProcessDipoleDPs(TMap* valueMap, AliGRPObject* grpObj)
+Int_t AliGRPPreprocessor::ProcessDipoleDPs(const TMap* valueMap, AliGRPObject* grpObj)
 {
+       // processing DPs
+       // related to 
+       // the Dipole info
+
        Int_t nDipoleEntries = 0;
        TObjArray *array = 0x0;
        Int_t indexDP = -1;
+       Bool_t isZero = kTRUE; // flag to monitor L3Current. If set to true, the magnet is OFF, and the polarity can change
 
-       AliInfo(Form("==========DipolePolarity==========="));
-       indexDP = kDipolePolarity;
-       AliInfo(Form("indexDP = %d",indexDP));
+       AliInfo(Form("==========DipoleCurrent==========="));
+       Bool_t outOfRange = kFALSE;  // flag to monitor if any value collected by DCS is out of range
+       indexDP = kDipoleCurrent;
        array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
-       AliInfo(Form("array entries = %d",array->GetEntries()));
        if(!array) {
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               Bool_t charDCS = ProcessBool(array);
-               grpObj->SetDipolePolarity(charDCS);
-               nDipoleEntries++;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Float_t *floatDCS = ProcessFloatAllMagnet(array, indexDP, isZero);
+                       if (floatDCS != NULL){
+                               grpObj->SetDipoleCurrent(floatDCS);
+                       } 
+                       else{
+                               outOfRange=kTRUE;
+                       }
+                       if (floatDCS){
+                               delete[] floatDCS;
+                               floatDCS = 0x0;
+                       }
+               }
+               if (!outOfRange) nDipoleEntries++;
        }
 
        if (array) array = 0x0;
 
-       AliInfo(Form("==========DipoleCurrent==========="));
-       indexDP = kDipoleCurrent;
+       AliInfo(Form("==========DipolePolarity==========="));
+       indexDP = kDipolePolarity;
        array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
        if(!array) {
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               Float_t *floatDCS = ProcessFloatAll(array);
-               grpObj->SetDipoleCurrent(floatDCS);
-               delete floatDCS;
-               nDipoleEntries++;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Bool_t change = kFALSE;
+                       Char_t charDCS = ProcessBool(array,change);
+                       if (!change){
+                               grpObj->SetDipolePolarity(charDCS);
+                               AliInfo(Form("%s set to %d",fgkDCSDataPoints[indexDP],(Int_t)(grpObj->GetDipolePolarity())));
+                               nDipoleEntries++;
+                       }
+                       else if (isZero){
+                               AliInfo(Form("%s set to invalid, but magnet was OFF (according to the current), DP not considered wrong",fgkDCSDataPoints[indexDP]));
+                               nDipoleEntries++;
+                       }
+                       else{
+                               AliError(Form("%s value changed within the run while the magnet was ON (according to the current), setting it to invalid and considering the DP as wrong", fgkDCSDataPoints[indexDP]));
+                       }
+               }
        }
 
        return nDipoleEntries;
@@ -675,20 +851,39 @@ Int_t AliGRPPreprocessor::ProcessDipoleDPs(TMap* valueMap, AliGRPObject* grpObj)
 
 Int_t AliGRPPreprocessor::ProcessEnvDPs(TMap* valueMap, AliGRPObject* grpObj)
 {
+       // processing DPs
+       // related to 
+       // evironment conditions (temperature, pressure) info
+
        Int_t nEnvEntries = 0;
        TObjArray *array = 0x0;
        Int_t indexDP = -1;
 
        AliInfo(Form("==========CavernTemperature==========="));
+       Bool_t outOfRange = kFALSE;  // flag to monitor if any value collected by DCS is out of range
        indexDP = kCavernTemperature;
        array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
        if(!array) {
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               Float_t *floatDCS = ProcessFloatAll(array);
-               grpObj->SetCavernTemperature(floatDCS);
-               nEnvEntries++;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Float_t *floatDCS = ProcessFloatAll(array);
+                       if (floatDCS != NULL){
+                               grpObj->SetCavernTemperature(floatDCS);
+                       }
+                       else{
+                               outOfRange = kTRUE;
+                       }
+                       if (floatDCS){
+                               delete[] floatDCS;
+                               floatDCS = 0x0;
+                       }
+               }
+               if (!outOfRange) nEnvEntries++;
        }
 
        if (array) array = 0x0;
@@ -696,8 +891,6 @@ Int_t AliGRPPreprocessor::ProcessEnvDPs(TMap* valueMap, AliGRPObject* grpObj)
        AliInfo(Form("==========AtmosPressures (Cavern + Surface)==========="));
        AliDCSSensorArray *dcsSensorArray = GetPressureMap(valueMap);
        dcsSensorArray->Print();
-       AliInfo(Form("fPressure = %p",fPressure));
-       AliInfo(Form("dcsSensorArray = %p",dcsSensorArray));
        if( fPressure->NumFits()==0 ) {
                Log("Problem with the pressure sensor values!!!");
        } 
@@ -713,7 +906,7 @@ Int_t AliGRPPreprocessor::ProcessEnvDPs(TMap* valueMap, AliGRPObject* grpObj)
                } 
                //if (sensorP2) delete sensorP2;
                else {
-                       Log(Form("ERROR Sensor Fit for %s not found: ", fgkDCSDataPoints[indexDP] ));
+                       Log(Form("ERROR Sensor Fit for %s not found ", fgkDCSDataPoints[indexDP] ));
                }
                AliInfo(Form("==========SurfaceAtmosPressure==========="));
                indexDP = kSurfaceAtmosPressure;
@@ -726,88 +919,68 @@ Int_t AliGRPPreprocessor::ProcessEnvDPs(TMap* valueMap, AliGRPObject* grpObj)
                } 
                //if (sensorP2) delete sensorP2;
                else {
-                       Log(Form("ERROR Sensor Fit for %s not found: ", fgkDCSDataPoints[indexDP] ));
+                       Log(Form("ERROR Sensor Fit for %s not found ", fgkDCSDataPoints[indexDP] ));
                }
                
        }
 
-       /*      indexDP = kCavernAtmosPressure;
-       array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
-       if(!array) {
-               Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
-       } 
-       else {
-               Float_t *floatDCS = ProcessFloatAll(array);
-               grpObj->SetCavernAtmosPressure(floatDCS);
-               delete floatDCS;
-               nEnvEntries++;
-       }
-       
-
-       if (array) array = 0x0;
-
-       AliInfo(Form("==========SurfaceAtmosPressure==========="));
-       indexDP = kSurfaceAtmosPressure;
-       AliDCSSensorArray *dcsSensorArray = GetPressureMap(valueMap);
-       dcsSensorArray->Print();
-       AliInfo(Form("fPressure = %p",fPressure));
-       AliInfo(Form("dcsSensorArray = %p",dcsSensorArray));
-       if( fPressure->NumFits()==0 ) {
-               Log("Problem with the pressure sensor values!!!");
-       } 
-       else {
-               AliDCSSensor* sensorP2 = dcsSensorArray->GetSensor(fgkDCSDataPoints[indexDP]);
-               AliDebug(2,Form("sensorP2 = %p", sensorP2));
-               if( sensorP2->GetFit() ) {
-                       Log(Form("<%s> for run %d: Sensor Fit found",fgkDCSDataPoints[indexDP], fRun));
-                       grpObj->SetSurfaceAtmosPressure(sensorP2);
-                       nEnvEntries++;
-               } 
-               //if (sensorP2) delete sensorP2;
-               else {
-                       Log(Form("ERROR Sensor Fit for %s not found: ", fgkDCSDataPoints[indexDP] ));
-               }
-               
-       }
-       */
-
        return nEnvEntries;
 }
 //_______________________________________________________________
 
-Int_t AliGRPPreprocessor::ProcessHPDPs(TMap* valueMap, AliGRPObject* grpObj)
+Int_t AliGRPPreprocessor::ProcessHPDPs(const TMap* valueMap, AliGRPObject* grpObj)
 {
+       // processing DPs
+       // related to 
+       // Hall Probes info
+
        Int_t nHPEntries = 0;
        TObjArray *array = 0x0;
        Int_t indexDP = -1;
+       Bool_t outOfRange; // flag to monitor if any value collected by DCS is out of range
 
-       if (fgknDCSDP_HallProbes != AliGRPObject::GetNumberOfHP()){
-               AliError(Form("Number of Hall probes expected in GRP Preprocessor (i.e. %d) different from number of Hall Probes foreseen in GRP object (i.e. %d). Looping on entries from GRP object anyway.", fgknDCSDP_HallProbes, AliGRPObject::GetNumberOfHP()));
+       if (fgknDCSDPHallProbes != AliGRPObject::GetNumberOfHP()){
+               AliError(Form("Number of Hall probes expected in GRP Preprocessor (i.e. %d) different from number of Hall Probes foreseen in GRP object (i.e. %d). Looping on entries from GRP object anyway.", fgknDCSDPHallProbes, AliGRPObject::GetNumberOfHP()));
        }
        for (indexDP = 0; indexDP < AliGRPObject::GetNumberOfHP(); indexDP++){
+               outOfRange = kFALSE; // resetting outOfRange flag at each HP
                AliInfo(Form("==========%s===========",AliGRPObject::GetHPDP(indexDP)));
                array = (TObjArray *)valueMap->GetValue(AliGRPObject::GetHPDP(indexDP));
                if(!array) {
                        Log(Form("%s not found in the map!!!",AliGRPObject::GetHPDP(indexDP)));
                } 
                else {
-                       Float_t *floatDCS = ProcessFloatAll(array);
-                       AliDebug(2,Form("value[0] = %f, value[1] = %f, value[2] = %f, value[3] = %f, value[4] = %f",floatDCS[0],floatDCS[1],floatDCS[2],floatDCS[3],floatDCS[4])); 
-                       grpObj->SetHallProbes((AliGRPObject::DP_HallProbes)indexDP,floatDCS);
-                       for (Int_t kk = 0 ; kk< 5; kk++){
-                               AliDebug(2,Form("HallProbe[%d][%d]=%f",indexDP,kk,grpObj->GetHallProbes((AliGRPObject::DP_HallProbes)indexDP,(AliGRPObject::Stats)kk)));
+                       if (array->GetEntries() == 0){
+                               AliError(Form("No entries found in array! setting %s to invalid...",AliGRPObject::GetHPDP(indexDP)));
+                       }
+                       else {
+                               Float_t *floatDCS = ProcessFloatAll(array);
+                               if (floatDCS != NULL){
+                                       AliDebug(2,Form("value[0] = %f, value[1] = %f, value[2] = %f, value[3] = %f, value[4] = %f",floatDCS[0],floatDCS[1],floatDCS[2],floatDCS[3],floatDCS[4])); 
+                                       grpObj->SetHallProbes((AliGRPObject::DP_HallProbes)indexDP,floatDCS);
+                                       for (Int_t kk = 0 ; kk< 5; kk++){
+                                               AliDebug(2,Form("HallProbe[%d][%d]=%f",indexDP,kk,grpObj->GetHallProbes((AliGRPObject::DP_HallProbes)indexDP,(AliGRPObject::Stats)kk)));
+                                       }
+                               }
+                               else{
+                                       outOfRange = kTRUE;
+                               }
+                               if (floatDCS){
+                                       delete[] floatDCS;
+                                       floatDCS = 0x0;
+                               }
                        }
-                       delete floatDCS;
-                       nHPEntries++;
+                       if (!outOfRange) nHPEntries++;
                }
        }
                
-       return 0;
+       Log(Form("Hall Probes = %d ", nHPEntries));
+       return nHPEntries;
 }
 
 //_______________________________________________________________
 
-Int_t AliGRPPreprocessor::ProcessLHCDPs(TMap* valueMap, AliGRPObject* grpObj)
+Int_t AliGRPPreprocessor::ProcessLHCDPs(const TMap* valueMap, AliGRPObject* grpObj)
 {
 
        //
@@ -828,75 +1001,111 @@ Int_t AliGRPPreprocessor::ProcessLHCDPs(TMap* valueMap, AliGRPObject* grpObj)
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               TString stringDCS = ProcessChar(array);
-               if (stringDCS.Length()!=0) {
-                       Bool_t found = kFALSE;
-                       for( Int_t i=0; i<20; i+=2 ) {
-                               if( stringDCS.CompareTo(fgkLHCState[i]) == 0 ) {
-                                       stringDCS = fgkLHCState[i+1];
-                                       found = kTRUE;
-                                       break;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       TString stringDCS = ProcessChar(array);
+                       if (stringDCS.Length()!=0) {
+                               Bool_t found = kFALSE;
+                               for( Int_t i=0; i<20; i+=2 ) {
+                                       if( stringDCS.CompareTo(fgkLHCState[i]) == 0 ) {
+                                               stringDCS = fgkLHCState[i+1];
+                                               found = kTRUE;
+                                               break;
+                                       }
                                }
+                               if (found){
+                                       Log(Form("<%s> for run %d: %s",fgkDCSDataPoints[indexDP],fRun, stringDCS.Data()));
+                                       grpObj->SetLHCState(stringDCS);
+                               }
+                               else{
+                                       Log(Form("%s values found not valid!",fgkDCSDataPoints[indexDP]));
+                                       grpObj->SetLHCState(AliGRPObject::GetInvalidString());
+                               } 
                        }
-                       if (found){
-                               Log(Form("<%s> for run %d: %s",fgkDCSDataPoints[indexDP],fRun, stringDCS.Data()));
-                               grpObj->SetLHCState(stringDCS);
-                       }
-                       else{
-                               Log(Form("%s values found not valid!",fgkDCSDataPoints[indexDP]));
+                       else {
+                               Log(Form("%s not valid (null length), string set as invalid!",fgkDCSDataPoints[indexDP]));
                                grpObj->SetLHCState(AliGRPObject::GetInvalidString());
-                       } 
+                       }         
                }
-               else {
-                       Log(Form("%s not valid (null length), string set as invalid!",fgkDCSDataPoints[indexDP]));
-                       grpObj->SetLHCState(AliGRPObject::GetInvalidString());
-               }         
                nLHCEntries++;
        }
        
        if (array) array = 0x0;
 
        AliInfo(Form("==========LHCLuminosity==========="));
+       Bool_t outOfRange = kFALSE; // flag to monitor if any value collected by DCS is out of range
        indexDP = kLHCLuminosity;
        array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
        if(!array) {
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               Float_t *floatDCS = ProcessFloatAll(array);
-               grpObj->SetLHCLuminosity(floatDCS);
-               delete floatDCS;
-               nLHCEntries++;
-               AliSplineFit* splfit = GetSplineFit(array,fgkDCSDataPoints[indexDP]);
-               grpObj->SetLHCLuminositySplineFit(splfit);
-               //              delete splfit;
-               nLHCEntries++;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s and its Spline Fit to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Float_t *floatDCS = ProcessFloatAll(array);
+                       if (floatDCS != NULL){
+                               grpObj->SetLHCLuminosity(floatDCS);
+                               AliSplineFit* splfit = GetSplineFit(array,fgkDCSDataPoints[indexDP]);
+                               grpObj->SetLHCLuminositySplineFit(splfit);
+                       //              delete splfit;
+                       }
+                       else {
+                               outOfRange = kTRUE;
+                       }
+                       if (floatDCS){
+                               delete[] floatDCS;
+                               floatDCS = 0x0;
+                       }
+               }
+               if (!outOfRange) nLHCEntries++;
        }
 
        if (array) array = 0x0;
 
        AliInfo(Form("==========BeamIntensity==========="));
+       if (outOfRange) outOfRange = kFALSE;  // resetting outOfRange if needed
        indexDP = kBeamIntensity;
        array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
        if(!array) {
                Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
        } 
        else {
-               Float_t *floatDCS = ProcessFloatAll(array);
-               grpObj->SetBeamIntensity(floatDCS);
-               delete floatDCS;
-               nLHCEntries++;
-               AliSplineFit* splfit1 = GetSplineFit(array,fgkDCSDataPoints[indexDP]);
-               grpObj->SetBeamIntensitySplineFit(splfit1);
-               //delete splfit;
-               nLHCEntries++;
+               if (array->GetEntries() == 0){
+                       AliError(Form("No entries found in array! setting %s and its Spline Fit to invalid...",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Float_t *floatDCS = ProcessFloatAll(array);
+                       if (floatDCS != NULL){
+                               grpObj->SetBeamIntensity(floatDCS);
+                               AliSplineFit* splfit1 = GetSplineFit(array,fgkDCSDataPoints[indexDP]);
+                               grpObj->SetBeamIntensitySplineFit(splfit1);
+                               //delete splfit;
+                       }
+                       else{
+                               outOfRange = kTRUE;
+                       }
+                       if (floatDCS){
+                               delete[] floatDCS;
+                               floatDCS = 0x0;
+                       }
+               }
+               if (!outOfRange) nLHCEntries++;
        }
 
        return nLHCEntries;
 }
 //_________________________________________________________________________
 
-AliSplineFit* AliGRPPreprocessor::GetSplineFit(TObjArray *array, const TString& stringID){
+AliSplineFit* AliGRPPreprocessor::GetSplineFit(const TObjArray *array, const TString& stringID){
+
+
+       // 
+       // returning Spline Fit 
+       // 
 
        Int_t entriesarray = array->GetEntries();
        Float_t* value = new Float_t[entriesarray];
@@ -906,7 +1115,7 @@ AliSplineFit* AliGRPPreprocessor::GetSplineFit(TObjArray *array, const TString&
                v = (AliDCSValue*)array->At(iarray);
                value[iarray] = v->GetFloat();
                time[iarray] = v->GetTimeStamp();
-               AliInfo(Form("iarray = %d, value = %f, time = %f",iarray,value[iarray],time[iarray]));
+               AliDebug(2,Form("iarray = %d, value = %f, time = %f",iarray,value[iarray],time[iarray]));
        }
        TGraph* gr = new TGraph(entriesarray,value,time);
        if (!gr ) {
@@ -927,7 +1136,7 @@ AliSplineFit* AliGRPPreprocessor::GetSplineFit(TObjArray *array, const TString&
 
 //_________________________________________________________________________
 
-TString AliGRPPreprocessor::ProcessChar(TObjArray *array)
+TString AliGRPPreprocessor::ProcessChar(const TObjArray *array)
 {
 
        // 
@@ -939,12 +1148,12 @@ TString AliGRPPreprocessor::ProcessChar(TObjArray *array)
        AliDCSValue *v = 0x0;
        for(Int_t iCount = 0; iCount < array->GetEntries(); iCount++) {
                v = (AliDCSValue *)array->At(iCount);
-               if ((v->GetTimeStamp() < fStartTime) || (v->GetTimeStamp() > fEndTime)) {
+               if (((Int_t)(v->GetTimeStamp()) < (Int_t)GetStartTimeDCSQuery()) || ((Int_t)(v->GetTimeStamp()) > (Int_t)GetEndTimeDCSQuery())) {
                        AliError(Form("DCS values for the parameter outside the queried interval"));
                        continue;
                }
                if (iCount > 0) {
-                       if (aDCSString != v->GetChar());
+                       if (aDCSString != v->GetChar())
                        AliError(Form("DCS values for the parameter changed from %s to %c within the queried interval", aDCSString.Data(), (Char_t)v->GetChar()));
                }
                aDCSString = (TString)v->GetChar();  // keeping always last value in the array
@@ -954,7 +1163,7 @@ TString AliGRPPreprocessor::ProcessChar(TObjArray *array)
 
 //__________________________________________________________________________________________________________________
 
-Float_t* AliGRPPreprocessor::ProcessFloatAll(TObjArray* array)
+Float_t* AliGRPPreprocessor::ProcessFloatAll(const TObjArray* array)
 {
        // 
        // processing Float values using Mean, Median, Standard Deviation wrt Mean, Standar Deviation wrt Median 
@@ -966,7 +1175,7 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(TObjArray* array)
        // parameters[4] = standard deviation wrt median
        //
 
-       Float_t* parameters = new Float_t[4];
+       Float_t* parameters = new Float_t[5];
        Double_t aDCSArrayMean = 0;     // Mean
        Double_t aDCSArrayTruncMean = 0;// Truncated Mean
        Double_t aDCSArrayMedian = 0;   // Median
@@ -981,37 +1190,54 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(TObjArray* array)
        Float_t *tempArray = new Float_t[nCounts];
        for(Int_t i = 0; i < nCounts; i++) {
                AliDCSValue *v = (AliDCSValue *)array->At(i);
-               if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fEndTime)) {
+               if ((v->GetFloat() <= fminFloat) || (v->GetFloat() >= fmaxFloat)) {
+                       AliError(Form("Error! Float value found in DCS map at %d-th entry is OUT OF RANGE: value = %6.5e",i,v->GetFloat()));
+                       if (v->GetFloat() < fminFloat) AliInfo(Form("The value is smaller than %6.5e",fminFloat));
+                       if (v->GetFloat() > fmaxFloat) AliInfo(Form("The value is greater than %6.5e",fmaxFloat));
+                       return NULL;
+               }
+               if(((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) &&((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery())) {
                        aDCSArraySum += v->GetFloat();
                        tempArray[i] = v->GetFloat();
                        AliDebug(2,Form("%d-th entry = %f",i,tempArray[i]));
                        iCounts += 1;
                }
+               else {
+                       AliError(Form("DCS values for the parameter outside the queried interval"));
+               }
        }
 
+       AliDebug(2,Form("Using %i entries, starting from %i entries",iCounts,nCounts));
        if(iCounts != 0) {
-               aDCSArrayMean = TMath::Mean(nCounts,tempArray);
-               aDCSArrayMedian = TMath::Median(nCounts,tempArray);
-               aDCSArraySDMean = TMath::RMS(nCounts,tempArray);
+               aDCSArrayMean = TMath::Mean(iCounts,tempArray);
+               aDCSArrayMedian = TMath::Median(iCounts,tempArray);
+               aDCSArraySDMean = TMath::RMS(iCounts,tempArray);
+               AliDebug(2,Form("SD = %f",aDCSArraySDMean));
                // computing standard deviation wrt median
                AliDebug(2,Form("maximum = %f, minimum = %f", aDCSArrayMean+3*aDCSArraySDMean, aDCSArrayMean-3*aDCSArraySDMean));
                for (Int_t i = 0; i < iCounts; i++){
                        AliDCSValue *v = (AliDCSValue *)array->At(i);
-                       AliDebug(2,Form("maximum = %f, minimum = %f", aDCSArrayMean+3*aDCSArraySDMean, aDCSArrayMean-3*aDCSArraySDMean));
-                       AliDebug(2,Form("%i-th entry = %f",i, v->GetFloat())); 
-                       if ((v->GetFloat()<aDCSArrayMean+3*aDCSArraySDMean) && (v->GetFloat()>aDCSArrayMean-3*aDCSArraySDMean)){
+                       AliDebug(3,Form("maximum = %f, minimum = %f", aDCSArrayMean+3*aDCSArraySDMean, aDCSArrayMean-3*aDCSArraySDMean));
+                       AliDebug(3,Form("%i-th entry = %f",i, v->GetFloat())); 
+                       if ((v->GetFloat()<=aDCSArrayMean+3*aDCSArraySDMean) && (v->GetFloat()>=aDCSArrayMean-3*aDCSArraySDMean)){
                                temp1+=v->GetFloat();
                                iCounts1++;
-                               AliDebug(2,Form("temp1 = %f, iCounts = %i",temp1,iCounts1));
+                               AliDebug(3,Form("temp1 = %f, iCounts1 = %i",temp1,iCounts1));
                        }
                        temp += (v->GetFloat()-aDCSArrayMedian)*(v->GetFloat()-aDCSArrayMedian);
                }
+               AliDebug(3,Form("temp before the ratio = %f, with %d counts", temp, iCounts));
                temp/=iCounts;
+               AliDebug(3,Form("temp after the ratio = %f", temp));
                if (temp>0) {
                        aDCSArraySDMedian = TMath::Sqrt(temp);
                }
+               else if (temp==0) {
+                       AliInfo(Form("Radical = 0 in computing standard deviation wrt median! Setting it to zero...."));
+                       aDCSArraySDMedian = 0;
+               }
                else{
-                       AliError(Form("Radical <= 0 in computing standard deviation! Setting it to -99999...."));
+                       AliError(Form("Radical < 0 in computing standard deviation! Setting it to invalid...."));
                        aDCSArraySDMedian = AliGRPObject::GetInvalidFloat();
                }
        }
@@ -1020,6 +1246,7 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(TObjArray* array)
                aDCSArrayMedian = AliGRPObject::GetInvalidFloat();
                aDCSArraySDMean = AliGRPObject::GetInvalidFloat();
        }
+       AliDebug(3,Form("iCounts1 = %d and temp1 = %f",iCounts1, temp1));
        if (iCounts1 > 0) {
                aDCSArrayTruncMean = temp1/iCounts1;
        }
@@ -1029,11 +1256,11 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(TObjArray* array)
        
        
        
-       AliDebug(2,Form("mean within %d counts = %f ",nCounts,aDCSArrayMean));
-       AliDebug(2,Form("truncated mean within %d counts = %f (%i values used)",nCounts,aDCSArrayTruncMean,iCounts1));
-       AliDebug(2,Form("median within %d counts = %f ",nCounts,aDCSArrayMedian));
-       AliDebug(2,Form("standard deviation with mean within %d counts = %f ",nCounts,aDCSArraySDMean));
-       AliDebug(2,Form("standard deviation with median within %d counts = %f ",nCounts,aDCSArraySDMedian));
+       AliDebug(2,Form("mean within %d counts = %f ",iCounts,aDCSArrayMean));
+       AliDebug(2,Form("truncated mean within %d counts = %f (%i values used)",iCounts,aDCSArrayTruncMean,iCounts1));
+       AliDebug(2,Form("median within %d counts = %f ",iCounts,aDCSArrayMedian));
+       AliDebug(2,Form("standard deviation with mean within %d counts = %f ",iCounts,aDCSArraySDMean));
+       AliDebug(2,Form("standard deviation with median within %d counts = %f ",iCounts,aDCSArraySDMedian));
        
        parameters[0] = aDCSArrayMean;
        parameters[1] = aDCSArrayTruncMean;
@@ -1041,7 +1268,130 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(TObjArray* array)
        parameters[3] = aDCSArraySDMean;
        parameters[4] = aDCSArraySDMedian;
 
-       AliDebug(2,Form("parameters[0] = %f, parameters[1] = %f, parameters[2] = %f, parameters[3] = %f, parameters[4] = %f ",parameters[0],parameters[1],parameters[2],parameters[3],parameters[4]));
+       AliDebug(2,Form("mean = %f, truncated mean = %f, median = %f, SD wrt mean = %f, SD wrt median = %f ",parameters[0],parameters[1],parameters[2],parameters[3],parameters[4]));
+       //AliInfo(Form("mean = %f, truncated mean = %f, median = %f, SD wrt mean = %f, SD wrt median = %f ",parameters[0],parameters[1],parameters[2],parameters[3],parameters[4]));
+
+       return parameters;
+}
+
+
+
+//__________________________________________________________________________________________________________________
+
+Float_t* AliGRPPreprocessor::ProcessFloatAllMagnet(const TObjArray* array, Int_t indexDP, Bool_t &isZero)
+{
+       // 
+       // processing Float values using Mean, Median, Standard Deviation wrt Mean, Standar Deviation wrt Median 
+       // used for L3 and Dipole magnets, using isZero flag to decide whther the magnet was OFF/ON
+       // the flag is set according to the L3/Dipole current value
+       // current threshold for L3 = 350 A (value provided by DCS)
+       // current threshold for Dipole = 450 A (value provided by DCS)
+       //
+       // parameters[0] = mean
+       // parameters[1] = truncated mean (calculated excluding points outside +/- 3RMS from mean
+       // parameters[2] = median
+       // parameters[3] = standard deviation wrt mean
+       // parameters[4] = standard deviation wrt median
+       //
+
+       AliInfo(Form("indexDP = %d",indexDP)); 
+       Float_t* parameters = new Float_t[5];
+       Double_t aDCSArrayMean = 0;     // Mean
+       Double_t aDCSArrayTruncMean = 0;// Truncated Mean
+       Double_t aDCSArrayMedian = 0;   // Median
+       Double_t aDCSArraySDMean = 0;   // Standard Deviation wrt Mean
+       Double_t aDCSArraySDMedian = 0; // Standard Deviation wrt Median
+       Float_t aDCSArraySum = 0.0;
+       Int_t iCounts = 0;
+       Int_t iCounts1 = 0;
+       Float_t temp = 0;
+       Float_t temp1 = 0;
+       Int_t nCounts = array->GetEntries();
+       Float_t *tempArray = new Float_t[nCounts];
+       for(Int_t i = 0; i < nCounts; i++) {
+               AliDCSValue *v = (AliDCSValue *)array->At(i);
+               if ((v->GetFloat() <= fminFloat) || (v->GetFloat() >= fmaxFloat)) {
+                       AliError(Form("Error! Float value found in DCS map at %d-th entry is OUT OF RANGE: value = %6.5e",i,v->GetFloat()));
+if (v->GetFloat() < fminFloat) AliInfo(Form("The value is smaller than %6.5e",fminFloat));
+if (v->GetFloat() > fmaxFloat) AliInfo(Form("The value is greater than %6.5e",fmaxFloat));
+                       return NULL;
+               }
+               if(((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) &&((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery())) {
+                       aDCSArraySum += v->GetFloat();
+                       tempArray[i] = v->GetFloat();
+                       AliDebug(2,Form("%d-th entry = %f",i,tempArray[i]));
+                       iCounts += 1;
+                       if (indexDP == kL3Current && v->GetFloat() > 350 && isZero == kTRUE) isZero=kFALSE; 
+                       if (indexDP == kDipoleCurrent && v->GetFloat() > 450 && isZero == kTRUE) isZero=kFALSE; 
+               }
+               else {
+                       AliError(Form("DCS values for the parameter outside the queried interval"));
+               }
+       }
+
+       AliDebug(2,Form("Using %i entries, starting from %i entries",iCounts,nCounts));
+       if(iCounts != 0) {
+               aDCSArrayMean = TMath::Mean(iCounts,tempArray);
+               aDCSArrayMedian = TMath::Median(iCounts,tempArray);
+               aDCSArraySDMean = TMath::RMS(iCounts,tempArray);
+               AliDebug(2,Form("SD = %f",aDCSArraySDMean));
+               // computing standard deviation wrt median
+               AliDebug(2,Form("maximum = %f, minimum = %f", aDCSArrayMean+3*aDCSArraySDMean, aDCSArrayMean-3*aDCSArraySDMean));
+               for (Int_t i = 0; i < iCounts; i++){
+                       AliDCSValue *v = (AliDCSValue *)array->At(i);
+                       AliDebug(3,Form("maximum = %f, minimum = %f", aDCSArrayMean+3*aDCSArraySDMean, aDCSArrayMean-3*aDCSArraySDMean));
+                       AliDebug(3,Form("%i-th entry = %f",i, v->GetFloat())); 
+                       if ((v->GetFloat()<=aDCSArrayMean+3*aDCSArraySDMean) && (v->GetFloat()>=aDCSArrayMean-3*aDCSArraySDMean)){
+                               temp1+=v->GetFloat();
+                               iCounts1++;
+                               AliDebug(3,Form("temp1 = %f, iCounts1 = %i",temp1,iCounts1));
+                       }
+                       temp += (v->GetFloat()-aDCSArrayMedian)*(v->GetFloat()-aDCSArrayMedian);
+               }
+               AliDebug(3,Form("temp before the ratio = %f, with %d counts", temp, iCounts));
+               temp/=iCounts;
+               AliDebug(3,Form("temp after the ratio = %f", temp));
+               if (temp>0) {
+                       aDCSArraySDMedian = TMath::Sqrt(temp);
+               }
+               else if (temp==0) {
+                       AliInfo(Form("Radical = 0 in computing standard deviation wrt median! Setting it to zero...."));
+                       aDCSArraySDMedian = 0;
+               }
+               else{
+                       AliError(Form("Radical < 0 in computing standard deviation! Setting it to invalid...."));
+                       aDCSArraySDMedian = AliGRPObject::GetInvalidFloat();
+               }
+       }
+       else {
+               aDCSArrayMean = AliGRPObject::GetInvalidFloat();
+               aDCSArrayMedian = AliGRPObject::GetInvalidFloat();
+               aDCSArraySDMean = AliGRPObject::GetInvalidFloat();
+       }
+       AliDebug(3,Form("iCounts1 = %d and temp1 = %f",iCounts1, temp1));
+       if (iCounts1 > 0) {
+               aDCSArrayTruncMean = temp1/iCounts1;
+       }
+       else{
+               aDCSArrayTruncMean = AliGRPObject::GetInvalidFloat();
+       }
+       
+       
+       
+       AliDebug(2,Form("mean within %d counts = %f ",iCounts,aDCSArrayMean));
+       AliDebug(2,Form("truncated mean within %d counts = %f (%i values used)",iCounts,aDCSArrayTruncMean,iCounts1));
+       AliDebug(2,Form("median within %d counts = %f ",iCounts,aDCSArrayMedian));
+       AliDebug(2,Form("standard deviation with mean within %d counts = %f ",iCounts,aDCSArraySDMean));
+       AliDebug(2,Form("standard deviation with median within %d counts = %f ",iCounts,aDCSArraySDMedian));
+       
+       parameters[0] = aDCSArrayMean;
+       parameters[1] = aDCSArrayTruncMean;
+       parameters[2] = aDCSArrayMedian;
+       parameters[3] = aDCSArraySDMean;
+       parameters[4] = aDCSArraySDMedian;
+
+       AliDebug(2,Form("mean = %f, truncated mean = %f, median = %f, SD wrt mean = %f, SD wrt median = %f ",parameters[0],parameters[1],parameters[2],parameters[3],parameters[4]));
+       //AliInfo(Form("mean = %f, truncated mean = %f, median = %f, SD wrt mean = %f, SD wrt median = %f ",parameters[0],parameters[1],parameters[2],parameters[3],parameters[4]));
 
        return parameters;
 }
@@ -1049,7 +1399,7 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(TObjArray* array)
 
 //_______________________________________________________________
 
-Char_t AliGRPPreprocessor::ProcessBool(TObjArray* array)
+Char_t AliGRPPreprocessor::ProcessBool(const TObjArray* array, Bool_t &change)
 {
        // 
        // processing Boolean values
@@ -1058,31 +1408,35 @@ Char_t AliGRPPreprocessor::ProcessBool(TObjArray* array)
        Bool_t aDCSBool = kTRUE;
 
        AliDCSValue *v = 0x0;
-       
+
        for(Int_t iCount = 0; iCount < array->GetEntries(); iCount++) {
                v = (AliDCSValue *)array->At(iCount);
-               if ((v->GetTimeStamp() < fStartTime) || (v->GetTimeStamp() > fEndTime)) {
+               if (((Int_t)(v->GetTimeStamp()) < (Int_t)GetStartTimeDCSQuery()) || ((Int_t)(v->GetTimeStamp()) > (Int_t)GetEndTimeDCSQuery())) {
                        AliError(Form("DCS values for the parameter outside the queried interval"));
                        continue;
                }
                if (iCount > 0) {
-                       if (aDCSBool != v->GetBool());
+                       if (aDCSBool != v->GetBool())
                        AliError(Form("DCS values for the parameter changed from %d to %d within the queried interval", (UInt_t)aDCSBool, (UInt_t)v->GetBool()));
+                       change = kTRUE;
                }
                aDCSBool = v->GetBool(); // always keeping last value
+               AliDebug(2,Form("Bool = %d",(Int_t)aDCSBool));
        }
        
-       Char_t caDCSBool = (Char_t)aDCSBool;
+       Char_t caDCSBool = (Char_t) aDCSBool;
        return caDCSBool;
        
 }
 
 //_______________________________________________________________
 
-Float_t AliGRPPreprocessor::ProcessInt(TObjArray* array)
+Float_t AliGRPPreprocessor::ProcessInt(const TObjArray* array)
 {
        // 
        // processing Int values, returning mean
+       // AliGRPObject::GetInvalidFloat() is returned if any of the DCS values
+       // are outside the queried time interval or their value is out of range
        //
 
        Float_t aDCSArraySum = 0.0;
@@ -1092,7 +1446,11 @@ Float_t AliGRPPreprocessor::ProcessInt(TObjArray* array)
 
        for(Int_t iCount = 0; iCount < array->GetEntries(); iCount++) {
                v = (AliDCSValue *)array->At(iCount);
-               if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fEndTime)) {
+               if ((v->GetInt() < fminInt) || (v->GetInt() > fmaxInt)) {
+                       AliError(Form("Error! Int value found in DCS map at %d-th entry is OUT OF RANGE: value = %d",iCount, v->GetInt()));
+                       return AliGRPObject::GetInvalidFloat();
+               }
+               if(((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) &&((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery())) {
                        aDCSArraySum += v->GetInt();
                        iCounts += 1;
                }
@@ -1106,10 +1464,12 @@ Float_t AliGRPPreprocessor::ProcessInt(TObjArray* array)
 }
 //_______________________________________________________________
 
-Float_t AliGRPPreprocessor::ProcessUInt(TObjArray* array)
+Float_t AliGRPPreprocessor::ProcessUInt(const TObjArray* array)
 {
        // 
-       // processing Int values, returning mean
+       // processing Int values, returning mean 
+       // AliGRPObject::GetInvalidFloat() is returned if any of the DCS values
+       // are outside the queried time interval or their value is out of range
        //
 
        Float_t aDCSArraySum = 0.0;
@@ -1119,7 +1479,11 @@ Float_t AliGRPPreprocessor::ProcessUInt(TObjArray* array)
 
        for(Int_t iCount = 0; iCount < array->GetEntries(); iCount++) {
                v = (AliDCSValue *)array->At(iCount);
-               if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fEndTime)) {
+               if ((v->GetUInt() < fminUInt) || (v->GetUInt() > fmaxUInt)) {
+                       AliError(Form("Error! UInt value found in DCS map at %d-th entry is OUT OF RANGE: value = %u",iCount,v->GetUInt()));
+                       return AliGRPObject::GetInvalidFloat();
+               }
+               if(((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) &&((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery())) {
                        aDCSArraySum += v->GetUInt();
                        iCounts += 1;
                }
@@ -1139,7 +1503,6 @@ AliDCSSensorArray *AliGRPPreprocessor::GetPressureMap(TMap* dcsAliasMap)
 {
        // extract DCS pressure maps. Perform fits to save space
        
-       AliInfo ("here ok");
        TMap *map = fPressure->ExtractDCS(dcsAliasMap);
        if (map) {
                fPressure->MakeSplineFit(map);
@@ -1198,7 +1561,7 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        
        // main logbook
        TString sqlQuery;
-       sqlQuery.Form("SELECT DAQ_time_start, run_type, detectorMask FROM logbook WHERE run = %d", run);
+       sqlQuery.Form("SELECT DAQ_time_start, run_type, detectorMask, L3_magnetCurrent, Dipole_magnetCurrent FROM logbook WHERE run = %d", run);
        TSQLResult* result = server->Query(sqlQuery);
        if (!result)
                {
@@ -1221,13 +1584,23 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
                        return -4;
                }
        
+       TString timeStartString(row->GetField(0));
        TString runType(row->GetField(1));
-       
-       TMap grpData;
-       grpData.Add(new TObjString("DAQ_time_start"), new TObjString(row->GetField(0)));
-       grpData.Add(new TObjString("run_type"), new TObjString(runType));
-       grpData.Add(new TObjString("detectorMask"), new TObjString(row->GetField(2)));
-       
+       TString detectorMaskString(row->GetField(2));
+       TString l3CurrentString(row->GetField(3));
+       TString dipoleCurrentString(row->GetField(4));
+       time_t timeStart = (time_t)(timeStartString.Atoi());
+       UInt_t detectorMask = (UInt_t)(detectorMaskString.Atoi());
+       Float_t l3Current = (Float_t)(TMath::Abs(l3CurrentString.Atof()));
+       Float_t dipoleCurrent = (Float_t)(TMath::Abs(dipoleCurrentString.Atof()));
+       
+       AliGRPObject * grpObj = new AliGRPObject();
+       grpObj->SetTimeStart(timeStart); 
+       grpObj->SetRunType((TString)(row->GetField(1)));
+       grpObj->SetDetectorMask(detectorMask);
+       grpObj->SetL3Current(l3Current,(AliGRPObject::Stats)0);
+       grpObj->SetDipoleCurrent(dipoleCurrent,(AliGRPObject::Stats)0);
+
        delete row;
        row = 0;
        
@@ -1235,16 +1608,16 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        result = 0;
        
        Printf("Storing GRP/GRP/Data object with the following content");
-       grpData.Print();
+       grpObj->Dump();
        
        AliCDBMetaData metadata;
-       metadata.SetResponsible("Jan Fiete Grosse-Oetringhaus");
+       metadata.SetResponsible("Jan Fiete Grosse-Oetringhaus & Chiara Zampolli");
        metadata.SetComment("GRP Output parameters received during online running");
        
        AliCDBId id("GRP/GRP/Data", run, run);
-       Bool_t success = cdb->Put(&grpData, id, &metadata);
+       Bool_t success = cdb->Put(grpObj, id, &metadata);
        
-       grpData.DeleteAll();
+       delete grpObj;
        
        if (!success)
                {