]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/AliGRPPreprocessor.cxx
Coverity fixes.
[u/mrichter/AliRoot.git] / STEER / AliGRPPreprocessor.cxx
index 40acbf312dde5fc4fcaf0934ebef9a768f93ad00..8ff30685d0464f24cbb8bc80ae7695e4ea5a9966 100644 (file)
 #include <TList.h>
 #include <TMap.h>
 #include <TObjString.h>
+#include <TObjArray.h>
 #include <TGraph.h>
+#include <TString.h>
+#include <TFile.h>
 
 #include <float.h>
 
 #include "AliDCSSensor.h"
 #include "AliSplineFit.h"
 #include "AliDCSSensorArray.h"
-//#include "AliRawEventHeaderVersions.h"
+#include "AliRawEventHeaderVersions.h"
 
 #include "AliTriggerConfiguration.h"
 #include "AliTriggerRunScalers.h"
+#include "AliTriggerInput.h"
 
 #include "AliCDBMetaData.h"
-#include "AliLog.h"
-
+#include "AliESDVertex.h"
+#include "AliLHCReader.h"
+#include "AliLHCData.h"
+#include "AliDCSArray.h"
+#include "AliDAQ.h"
+#include "AliLTUConfig.h"
+
+class AliLog;
 class AliDCSValue;
 class AliShuttleInterface;
 
@@ -56,23 +66,24 @@ class AliShuttleInterface;
 #include <AliCDBMetaData.h>
 #include <AliCDBId.h>
 #include <AliTriggerConfiguration.h>
+#include <AliCTPTimeParams.h>
+#include <AliLHCClockPhase.h>
 
-const Double_t kFitFraction = 0.7;                 // Fraction of DCS sensor fits required
+const Double_t kFitFraction = -1.;                 // Fraction of DCS sensor fits required
 
 ClassImp(AliGRPPreprocessor)
 
 //_______________________________________________________________
 
-  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::fgknDAQLbPar = 6; // num parameters in the logbook used to fill the GRP object
+  const Int_t AliGRPPreprocessor::fgknDCSDP = 48;   // number of dcs dps
   const Int_t AliGRPPreprocessor::fgknDCSDPHallProbes = 40;   // number of dcs dps
+  const Int_t AliGRPPreprocessor::fgknLHCDP = 6;   // number of dcs dps from LHC data
+  const Int_t AliGRPPreprocessor::fgkDCSDPHallTopShift = 4;   // shift from the top to get tp the Hall Probes names in the list of DCS DPs
+  const Int_t AliGRPPreprocessor::fgkDCSDPNonWorking = 5; // number of non working DCS DPs
   const char* AliGRPPreprocessor::fgkDCSDataPoints[AliGRPPreprocessor::fgknDCSDP] = {
-                   "LHCState",              // missing in DCS
                    "L3Polarity",
                    "DipolePolarity",
-                   "LHCLuminosity",         // missing in DCS
-                   "BeamIntensity",         // missing in DCS
                    "L3Current",
                    "DipoleCurrent",
                   "L3_BSF17_H1",
@@ -117,7 +128,8 @@ ClassImp(AliGRPPreprocessor)
                   "Dipole_Outside_Temperature",
                    "CavernTemperature",
                    "CavernAtmosPressure",
-                   "SurfaceAtmosPressure"
+                   "SurfaceAtmosPressure",
+                   "CavernAtmosPressure2"
                  };
 
   const char* AliGRPPreprocessor::fgkDCSDataPointsHallProbes[AliGRPPreprocessor::fgknDCSDPHallProbes] = {
@@ -160,39 +172,42 @@ ClassImp(AliGRPPreprocessor)
                   "Dipole_Outside_H1",
                   "Dipole_Outside_H2",
                   "Dipole_Outside_H3",
-                  "Dipole_Outside_Temperature",
+                  "Dipole_Outside_Temperature"
                  };
                  
-  const Short_t kSensors = 48; // start index position of sensor in DCS DPs
-  const Short_t kNumSensors = 2; // Number of sensors in DCS DPs
-
-  const char* AliGRPPreprocessor::fgkLHCState[20] = {
-                   "P", "PREPARE",
-                   "J", "PREINJECTION",
-                   "I", "INJECTION",
-                   "F", "FILLING",
-                   "A", "ADJUST",
-                   "U", "UNSTABLE BEAMS",
-                   "S", "STABLE BEAMS",
-                   "D", "BEAM DUMP",
-                   "R", "RECOVER",
-                   "C", "PRECYCLE"
-                 };
+  const Short_t kSensors = 45; // start index position of sensor in DCS DPs
+  const Short_t kNumSensors = 3; // Number of sensors in DCS DPs (CavernAtmosPressure, SurfaceAtmosPressure, CavernAtmosPressure2)
+
+
+  const char* AliGRPPreprocessor::fgkLHCDataPoints[AliGRPPreprocessor::fgknLHCDP] = {
+         "LHC_Beam_Energy",
+         "LHC_MachineMode",
+         "LHC_BeamMode",
+          "LHC_Beams_Particle_Type",
+         "BPTX_Phase_Shift_B1",
+         "BPTX_Phase_Shift_B2"
+  };
 
   const char* kppError[] = {
                    "",
                    "(DAQ logbook ERROR)",
                    "(DAQ FXS ERROR)",
-                   "(DCS FXS ERROR)",
+                   "(Trigger Scalers not found in DCS FXS - ERROR)",
                    "(DCS data points ERROR)",
                    "(Trigger Configuration ERROR)",
-                   "(DAQ logbook ERROR determining partition of the run)"
+                   "(DAQ logbook ERROR determining partition of the run)",
+                   "(CTP timing ERROR)",
+                  "(SPD Mean Vertex ERROR)",
+                  "(DCS FXS Error for LHC Data)",
+                  "(LHC Data Error)",
+                  "(LHC Clock Phase Error (from LHC Data))",
+                  "(LTU Configuration Error)"
   };
 
 //_______________________________________________________________
 
 AliGRPPreprocessor::AliGRPPreprocessor(AliShuttleInterface* shuttle):
-       AliPreprocessor("GRP",shuttle),  fPressure(0), fmaxFloat(0), fminFloat(0),fmaxDouble(0), fminDouble(0), fmaxInt(0), fminInt(0), fmaxUInt(0), fminUInt(0)
+       AliPreprocessor("GRP",shuttle),  fPressure(0), fmaxFloat(0), fminFloat(0),fmaxDouble(0), fminDouble(0), fmaxInt(0), fminInt(0), fmaxUInt(0), fminUInt(0),fdaqStartEndTimeOk(kTRUE),ffailedDPs(new TObjArray(fgknDCSDP))
 {
        // constructor - shuttle must be instantiated!
 
@@ -211,6 +226,7 @@ AliGRPPreprocessor::AliGRPPreprocessor(AliShuttleInterface* shuttle):
        AddRunType("NOISE");
        AddRunType("PULSER");
         AddRunType("STANDALONE_PULSER");
+        AddRunType("STANDALONE_BC");
 
        fmaxFloat = FLT_MAX;
        fminFloat = -FLT_MAX;
@@ -230,6 +246,7 @@ AliGRPPreprocessor::AliGRPPreprocessor(AliShuttleInterface* shuttle):
        AliInfo(Form("Max allowed unsigned integer = %u",(Int_t)fmaxUInt));
        AliInfo(Form("Min allowed unsigned integer = %u",(Int_t)fminUInt));
 
+       ffailedDPs->SetOwner(kTRUE);
 }
 
 //_______________________________________________________________
@@ -239,27 +256,35 @@ AliGRPPreprocessor::~AliGRPPreprocessor()
        //destructor
        
        delete fPressure;
+       delete ffailedDPs;
+
 }
 
 //_______________________________________________________________
 
 void AliGRPPreprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTime)
 {
-  // Initialize preprocessor
+       // Initialize preprocessor
 
-  AliPreprocessor::Initialize(run, startTime, 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;
+               sens->SetStringID(fgkDCSDataPoints[j+kSensors]);
+       }
+       AliInfo(Form("Pressure Entries: %d",array->GetEntries()));
+       
+       fPressure = new AliDCSSensorArray(GetStartTimeDCSQuery(), GetEndTimeDCSQuery(), array);
 
-  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;
-    sens->SetStringID(fgkDCSDataPoints[j+kSensors]);
-  }
-  AliInfo(Form("Pressure Entries: %d",array->GetEntries()));
+       for (Int_t iDP=0; iDP < fgknDCSDP; iDP++){
+               TObjString* dp = new TObjString(fgkDCSDataPoints[iDP]);
+               ffailedDPs->AddAt(dp,iDP);
+       }
 
-  fPressure = new AliDCSSensorArray(GetStartTimeDCSQuery(), GetEndTimeDCSQuery(), array);
 }
 
 //_______________________________________________________________
@@ -276,25 +301,32 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        TString detector = (TString)GetRunParameter("detector");   
 
        AliGRPObject *grpobj = new AliGRPObject();  // object to store data
+       grpobj->SetBeamEnergyIsSqrtSHalfGeV(); // new format
 
        //=================//
        // DAQ logbook     //
        //=================//
+
+       Log("*************** Processing DAQ logbook");
+
        UInt_t error = 0;
        
        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!"));
+       if(iDaqLB == fgknDAQLbPar) {
+               Log(Form("DAQ Logbook, successful! Retrieved %d/%d entries",iDaqLB,fgknDAQLbPar));
        } else {
-               Log(Form("DAQ Logbook, could not get all expected entries!!!"));
+               Log(Form("DAQ Logbook, could not get all expected entries!!! Retrieved only %d/%d entries",iDaqLB,fgknDAQLbPar));
                error |= 1;
        }
 
        //=================//
        // DAQ FXS         //
        //=================//
+
+       Log("*************** Processing DAQ FXS");
+
        UInt_t iDaqFxs = ProcessDaqFxs();
        if( iDaqFxs == 0 ) {
                Log(Form("DAQ FXS, successful!"));
@@ -306,6 +338,9 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        //=================//
        // DCS FXS         //
        //=================//
+
+       Log("*************** Processing DCS FXS");
+
        UInt_t iDcsFxs = ProcessDcsFxs(partition, detector);
        if( iDcsFxs == 0 ) {
                Log(Form("DCS FXS, successful!"));
@@ -320,18 +355,40 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        //=================//
        // DCS data points //
        //=================//
+
+       Log("*************** Processing DCS DPs");
+
        Log(Form("Starting DCS Query at %d and finishing at %d",GetStartTimeDCSQuery(),GetEndTimeDCSQuery()));
        Int_t entries = ProcessDcsDPs( valueMap, grpobj );
-       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!"));
+       Log(Form("entries found = %d (should be %d)",entries, fgknDCSDP-fgkDCSDPNonWorking));
+       if (fdaqStartEndTimeOk){
+               if( entries < fgknDCSDP - fgkDCSDPNonWorking ) { // L3_BSF4_H3, L3_BSF17_H1, L3_BSF17_H2, L3_BSF17_H3, L3_BSF17_Temperature are not working yet...  
+                       Log(Form("Possible problem with the DCS data points!!! Only %d/%d entries found - Please read further for more details",entries,fgknDCSDP-fgkDCSDPNonWorking));
+                       Log(Form("The DPs giving problems were:"));
+                       for (Int_t iDP = 0; iDP < fgknDCSDP; iDP++){
+                               TObjString *dpString = (TObjString*)ffailedDPs->At(iDP);
+                               if (dpString){
+                                       TString name = dpString->String();
+                                       if (name != "L3_BSF4_H3" && name != "L3_BSF17_H1" && name != "L3_BSF17_H2" && name != "L3_BSF17_H3" && name != "L3_BSF17_Temperature" ){
+                                               Log(Form("******** %s ******** not present, but foreseen --> causing an ERROR",name.Data()));
+                                       }
+                                       else {
+                                               Log(Form(" %s is not present, but was not generating any error since it is not ready in DCS - check the other DPs in this list!",name.Data()));
+                                       }
+                               }
+                       }
+                       error |= 8;
+               }
+               else  Log(Form("DCS data points, successful!"));
+       }
+       else Log(Form("Statistical values for DCS DPs could not be computed due to missing DAQ_time_start and DAQ_time_end fields in DAQ logbook")); 
        
        //=======================//
        // Trigger Configuration //
        //=======================//
 
+       Log("*************** Processing Trigger Configuration");
+
        const char * triggerConf = GetTriggerConfiguration();
 
        if (partition.IsNull() && !detector.IsNull()){ // standalone partition
@@ -395,6 +452,210 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
                error |= 32;
        }
 
+        //===========================//
+       // Trigger Timing Parameters //
+        //===========================//
+
+       Log("*************** Processing Trigger Time Params");
+       
+       const char * triggerCTPtiming = GetCTPTimeParams();
+
+       if (partition.IsNull() && !detector.IsNull()){ // standalone partition
+               Log("STANDALONE partition for current run, using CTP timing params dummy value");
+               AliCDBEntry *cdbEntry = GetFromOCDB("CTP","DummyCTPtime");
+               if (!cdbEntry) {
+                       Log(Form("No dummy CTP timing parameters entry found, going into error..."));
+                       error |= 64;
+               }
+               else{
+                       AliCTPTimeParams *runCTPtiming = (AliCTPTimeParams*)cdbEntry->GetObject();
+                       if (!runCTPtiming){
+                               Log(Form("dummy CTP timing parameters not found in OCDB entry, going into error..."));
+                               error |= 64;
+                       }
+                       else {
+                               TString titleCTPtiming = Form("CTP timing params for run %i from Dummy entry in OCDB",fRun);
+                               runCTPtiming->SetTitle(titleCTPtiming);
+                               AliCDBMetaData metadata;
+                               metadata.SetResponsible("Roman Lietava");
+                               metadata.SetComment("CTP run timing parameters from dummy entry in OCDB");
+                               if (!Store("CTP","CTPtiming", runCTPtiming, &metadata, 0, 0)) {
+                                       Log("Unable to store the dummy CTP timing params object to OCDB!");
+                                       error |= 64;
+                               }
+                       }
+               }
+       }
+
+       else if (!partition.IsNull() && detector.IsNull()){ // global partition
+               Log("GLOBAL partition for current run, using Trigger Timing Parameters from DAQ Logbook");
+               if (triggerCTPtiming!= NULL) {
+                       Log("Found trigger timing params in DAQ logbook");
+                       AliDebug(2,Form("%s",triggerCTPtiming));
+                       AliCTPTimeParams *runCTPtiming = AliCTPTimeParams::LoadCTPTimeParamsFromString(triggerCTPtiming);         
+                       if (!runCTPtiming) {
+                               Log("Bad CTP trigger timing params file from DAQ logbook! The corresponding CDB entry will not be filled!");
+                               error |= 64;
+                       }
+                       else {
+                               TString titleCTPtiming = Form("CTP timing params for run %i from DAQ",fRun);
+                               runCTPtiming->SetTitle(titleCTPtiming);
+                               AliCDBMetaData metadata;
+                               metadata.SetBeamPeriod(0);
+                               metadata.SetResponsible("Roman Lietava");
+                               metadata.SetComment("CTP timing params from DAQ logbook");
+                               if (!Store("CTP","CTPtiming", runCTPtiming, &metadata, 0, 0)) {
+                                       Log("Unable to store the CTP timing params object to OCDB!");
+                                       error |= 64;
+                               }
+                       }
+               }
+
+               else {
+                       Log("Trigger timing params NULL in DAQ logbook");
+                       error |= 64;
+               }
+       }
+
+       else {
+               Log(Form("Incorrect field in DAQ logbook for partition = %s and detector = %s, going into error without trigger timing parameters...",partition.Data(),detector.Data()));
+               error |= 32;
+       }
+
+        //===========================//
+       // LTU Configuration         //
+        //===========================//
+
+       Log("*************** Processing LTU Configuration");
+       
+       if (partition.IsNull() && !detector.IsNull()){ // standalone partition
+               Log("STANDALONE partition for current run, using LTU configuration dummy value");
+               AliCDBEntry *cdbEntry = GetFromOCDB("CTP","DummyLTUConfig");
+               if (!cdbEntry) {
+                       Log(Form("No dummy LTU Config entry found, going into error..."));
+                       error |= 2048;
+               }
+               else{
+                       TObjArray *ltuConfig = (TObjArray*)cdbEntry->GetObject();
+                       if (!ltuConfig){
+                               Log(Form("dummy LTU Config not found in OCDB entry, going into error..."));
+                               error |= 2048;
+                       }
+                       else {
+                               AliCDBMetaData metadata;
+                               metadata.SetResponsible("Roman Lietava");
+                               metadata.SetComment("LTU Config from dummy entry in OCDB");
+                               if (!Store("CTP","LTUConfig", ltuConfig, &metadata, 0, 0)) {
+                                       Log("Unable to store the dummy LTU Config object to OCDB!");
+                                       error |= 2048;
+                               }
+                       }
+               }
+       }
+
+       else if (!partition.IsNull() && detector.IsNull()){ // global partition
+       
+               Log("GLOBAL partition for current run, getting LTU Config from DAQ Logbook (logbook_detectors table)");
+               UInt_t  detectorMask = (UInt_t)(((TString)GetRunParameter("detectorMask")).Atoi());
+               Printf ("detectormask = %d",detectorMask);
+               TObjArray * ltuarray = new TObjArray();
+               ltuarray->SetOwner(1);
+               Bool_t isLTUok = kTRUE;
+               for(Int_t i = 0; i<AliDAQ::kNDetectors-2; i++){
+                       if ((detectorMask >> i) & 0x1) {
+                               TString det = AliDAQ::OfflineModuleName(i);
+                               TString detCTPName = AliTriggerInput::fgkCTPDetectorName[i];
+                               if (detCTPName == "CTP") {
+                                       detCTPName="TRG"; // converting according to what is found in DAQ logbook_detectors                                     
+                                       Printf("Processing CTP (CTP Detector name %s) --> SKIPPING, CTP does not have any LTU!!!!!!",detCTPName.Data());
+                                       continue;
+                               }                               
+                               Printf("Processing detector %s (CTP Detector name %s)",det.Data(),detCTPName.Data());
+                               TString* ltu = GetLTUConfig(detCTPName.Data());
+                               if (!ltu){
+                                       Log(Form("No LTU Configuration from DAQ logbook for detector %s (BUT it was expected)! The corresponding CDB entry will not be filled!",detCTPName.Data()));
+                                       error |= 2048;
+                                       isLTUok = kFALSE;
+                                       break;
+                               }
+                               else{
+                                       Float_t ltuFineDelay1 = ltu[0].Atof();
+                                       Float_t ltuFineDelay2 = ltu[1].Atof();
+                                       Float_t ltuBCDelayAdd = ltu[2].Atof();
+                                       const char* name = AliDAQ::DetectorName(i);
+                                       AliLTUConfig* ltuConfig = new AliLTUConfig((UChar_t)AliDAQ::DetectorID(name),ltuFineDelay1,ltuFineDelay2,ltuBCDelayAdd);
+                                       ltuarray->AddAtAndExpand(ltuConfig,i);
+                               }                               
+                       }
+               }
+               if (isLTUok){
+                       AliCDBMetaData metadata;
+                       metadata.SetBeamPeriod(0);
+                       metadata.SetResponsible("Roman Lietava");
+                       metadata.SetComment("LTU Configuration for current run");
+                       if (!Store("CTP","LTUConfig", ltuarray, &metadata, 0, 0)) {
+                               Log("Unable to store the LTU Config object to OCDB!");
+                               error |= 2048;
+                       }               
+               }
+               if (ltuarray) delete ltuarray;
+       }
+
+       else {
+               Log(Form("Incorrect field in DAQ logbook for partition = %s and detector = %s, going into error without trigger timing parameters...",partition.Data(),detector.Data()));
+               error |= 32;
+       }
+
+
+       //=================//
+       // LHC Data        //
+       //=================//
+
+       if (runType == "PHYSICS"){  // processing the LHC file only in PHYSICS runs
+               Log("*************** Processing LHC Data");
+
+               UInt_t iLHCData = ProcessLHCData(grpobj);
+               
+               if( iLHCData == 0 ) {
+                       Log(Form("LHC Data from DCS FXS, successful!"));
+               } else  if (iLHCData == 1) {
+                       Log(Form("LHC Data, problems with DCS FXS!"));
+                       error |= 256;
+               } else  if (iLHCData == 2) {
+                       Log(Form("LHC Data, problems with DAQ_time_start/DAQ_time_end!"));
+                       error |= 512;
+               } else if (iLHCData ==3){
+                       Log(Form("Problems in storing LHC Phase - going into Error"));
+                       error |= 1024;
+               } else if (iLHCData ==4){
+                       Log(Form("Problems with LHC Phase - going into Error"));
+                       error |= 1024;
+               } else{
+                       Log(Form("LHC Data problems"));
+                       error |= 512;
+               }
+       
+       }
+
+       //==================//
+       // SPD Mean Vertex  //
+       //==================//
+
+       Log("*************** Processing SPD Mean Vertex");
+
+       if (runType == "PHYSICS"){
+               UInt_t iSPDMeanVertex = ProcessSPDMeanVertex();
+               if( iSPDMeanVertex == 1 ) {
+                       Log(Form("SPD Mean Vertex, successful!"));
+               } else {
+                       Log(Form("SPD Mean Vertex failed!!!"));
+                       error |= 128; 
+               }
+       }
+       else {
+               Log("SPD Mean Vertex not processed since runType != PHYSICS");
+       }
+
        // storing AliGRPObject in OCDB
 
        AliCDBMetaData md;
@@ -404,23 +665,412 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        Bool_t result = kTRUE;
        result = Store("GRP", "Data", grpobj, &md); 
        delete grpobj;
-       
+
        if (result && !error ) {
                Log("GRP Preprocessor Success");
                return 0;
        } else {
-               Log( Form("GRP Preprocessor FAILS!!! %s%s%s%s%s%s",
+               Log( Form("GRP Preprocessor FAILS!!! %s%s%s%s%s%s%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&32)?6:0]
+                         kppError[(error&32)?6:0],
+                         kppError[(error&64)?7:0],
+                         kppError[(error&128)?8:0],
+                         kppError[(error&256)?9:0],
+                         kppError[(error&512)?10:0],
+                         kppError[(error&1024)?11:0],
+                         kppError[(error&2048)?12:0]
                          ));
                return error;
        }
+
+
+}
+
+//_______________________________________________________________
+
+UInt_t AliGRPPreprocessor::ProcessLHCData(AliGRPObject *grpobj)
+{
+       //
+       //Getting the LHC Data from DCS FXS
+       //
+
+       TString timeStartString = (TString)GetRunParameter("DAQ_time_start");
+       TString timeEndString = (TString)GetRunParameter("DAQ_time_end");
+       if (timeStartString.IsNull() || timeEndString.IsNull()){
+               if (timeStartString.IsNull()){ 
+                       AliError("DAQ_time_start not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               else if (timeEndString.IsNull()){
+                       AliError("DAQ_time_end not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               return 2;
+       }  
+
+       Double_t timeStart = timeStartString.Atof();
+       Double_t timeEnd = timeEndString.Atof();
+
+       TString fileName = GetFile(kDCS, "LHCData","");
+       if (fileName.Length()>0){
+               AliInfo("Got The LHC Data file");
+               AliLHCReader lhcReader;
+
+               // Processing data to be put in AliGRPObject
+
+               // Energy
+               Log("*************Energy ");
+               TObjArray* energyArray = lhcReader.ReadSingleLHCDP(fileName.Data(),fgkLHCDataPoints[0]);
+               if (energyArray){                       
+                       Float_t energy = ProcessEnergy(energyArray,timeStart);
+                       if (energy != -1.) {
+                               grpobj->SetBeamEnergy(energy);
+                               grpobj->SetBeamEnergyIsSqrtSHalfGeV(kTRUE);
+                       }
+                       delete energyArray;
+               }
+               else {
+                       AliError("Energy not found in LHC Data file!!!");
+               }       
+
+               Double_t timeBeamModeEnd = timeEnd;        // max validity for Beam Mode 
+               Double_t timeMachineModeEnd = timeEnd;     // max validity for Machine Mode
+               Double_t timeBeamEnd = timeEnd;            // max validity for Beam Type
+               Double_t timeBeamModeStart = -1;    // min validity for Beam Mode
+               Double_t timeMachineModeStart = -1; // min validity for Machine Mode
+               Double_t timeBeamStart = -1;        // min validity for Beam Type
+               Int_t indexBeamMode = -1;                  // index of measurement used to set Beam Mode
+               Int_t indexMachineMode = -1;               // index of measurement used to set Beam Mode
+               Int_t indexBeam = -1;                      // index of measurement used to set Beam Mode
+               Bool_t foundBeamModeStart = kFALSE;        // flag to be set in case an entry for the Beam Mode is found before (or at) SOR
+               Bool_t foundMachineModeStart = kFALSE;     // flag to be set in case an entry for the Beam Mode is found before (or at) SOR
+               Bool_t foundBeamStart = kFALSE;            // flag to be set in case an entry for the Beam Mode is found before (or at) SOR
+               Bool_t flagBeamMode = kFALSE;  //flag set true if a changed occurred in BeamMode
+               Bool_t flagMachineMode = kFALSE;  //flag set true if a changed occurred in MachineMode
+               Bool_t flagBeam = kFALSE;  //flag set true if a changed occurred in BeamType
+               
+               // BeamMode
+               Log("*************BeamMode (LHCState) ");
+               TObjArray* beamModeArray = lhcReader.ReadSingleLHCDP(fileName.Data(),fgkLHCDataPoints[2]);
+               Int_t nBeamMode = -1;
+               if (beamModeArray){     
+                       nBeamMode = beamModeArray->GetEntries();        
+                       if (nBeamMode==0){
+                               AliInfo("Found zero entries for the Beam Mode, leaving it empty");
+                       }
+                       else{
+                               for (Int_t iBeamMode = 0; iBeamMode<nBeamMode; iBeamMode++){
+                                       AliDCSArray* beamMode = (AliDCSArray*)beamModeArray->At(iBeamMode);
+                                       if (beamMode){
+                                               if (beamMode->GetTimeStamp()<=timeStart && beamMode->GetTimeStamp()>=timeBeamModeStart){// taking always the very last entry: of two measurements have the same timestamp, the last one is taken
+                                                       timeBeamModeStart = beamMode->GetTimeStamp();
+                                                       indexBeamMode = iBeamMode;
+                                                       foundBeamModeStart = kTRUE;
+                                               }
+                                               else {
+                                                       break;
+
+                                               }
+                                       }
+                               }
+                               if (!foundBeamModeStart){
+                                       AliInfo("No value for the Beam Mode found before start of run, the Beam Mode will remain empty");
+                               }
+                               else {
+                                       AliDCSArray* beamMode = (AliDCSArray*)beamModeArray->At(indexBeamMode);
+                                       TObjString* beamModeString = beamMode->GetStringArray(0);
+                                       AliInfo(Form("LHC State (corresponding to BeamMode) = %s (set at %f)",(beamModeString->String()).Data(),beamMode->GetTimeStamp()));
+                                       grpobj->SetLHCState(beamModeString->String());
+                                       if (indexBeamMode < nBeamMode-1){
+                                               AliDCSArray* beamMode1 = (AliDCSArray*)beamModeArray->At(indexBeamMode+1);
+                                               if (beamMode1){
+                                                       if (beamMode1->GetTimeStamp()<=timeStart){
+                                                               AliError("you did not choose the correct value! there is still something before (or at) SOR, but later than this!");
+                                                       }
+                                                       else if (beamMode1->GetTimeStamp()>timeStart && beamMode1->GetTimeStamp()<=timeEnd){
+                                                               timeBeamModeEnd = beamMode1->GetTimeStamp();
+                                                               TObjString* beamModeString1 = beamMode1->GetStringArray(0);
+                                                               TString bmString0 = beamModeString->String();
+                                                               TString bmString1 = beamModeString1->String();
+                                                               if (bmString0.CompareTo(bmString1.Data(),TString::kIgnoreCase) == -1){
+                                                                       AliWarning(Form("The beam mode changed from %s to %s during the run at timestamp %f! Setting it to %s and keeping track of the time of the change to set MaxTimeLHCValidity afterward",bmString0.Data(), bmString1.Data(), timeBeamModeEnd, bmString0.Data()));
+                                                                       flagBeamMode = kTRUE;
+                                                               }
+                                                       }
+                                               }
+                                               else {
+                                                       AliInfo("Invalid pointer for the first entry for Beam Mode after the first valid one, not considering anything after what has already been found");
+                                               }
+                                       }
+                               }
+                       }
+                       delete beamModeArray;
+               }
+               else{
+                       AliError("Beam mode array not found in LHC Data file!!!");
+               }
+               
+               // MachineMode
+               Log("*************MachineMode ");
+               TObjArray* machineModeArray = lhcReader.ReadSingleLHCDP(fileName.Data(),fgkLHCDataPoints[1]);
+               Int_t nMachineMode = -1;
+               if (machineModeArray){
+                       nMachineMode = machineModeArray->GetEntries();
+                       if (nMachineMode==0){
+                               AliInfo("No Machine Mode found, leaving it empty");
+                       }
+                       else{
+                               for (Int_t iMachineMode = 0; iMachineMode<nMachineMode; iMachineMode++){
+                                       AliDCSArray* machineMode = (AliDCSArray*)machineModeArray->At(iMachineMode);
+                                       if (machineMode){
+                                               if (machineMode->GetTimeStamp()<=timeStart && machineMode->GetTimeStamp()>=timeMachineModeStart){// taking always the very last entry: of two measurements have the same timestamp, the last one is taken
+                                                       timeMachineModeStart = machineMode->GetTimeStamp();
+                                                       indexMachineMode = iMachineMode;
+                                                       foundMachineModeStart = kTRUE;
+                                               }
+                                               else{
+                                                       break;
+                                               }
+                                       }
+                               }
+                               if (!foundMachineModeStart){
+                                       AliInfo("No value for the Machine Mode found before start of run, the Machine Mode will remain empty");
+                               }
+                               else {
+                                       AliDCSArray* machineMode = (AliDCSArray*)machineModeArray->At(indexMachineMode);
+                                       TObjString* machineModeString = machineMode->GetStringArray(0);
+                                       AliInfo(Form("MachineMode = %s (set at %f)",(machineModeString->String()).Data(),machineMode->GetTimeStamp()));
+                                       grpobj->SetMachineMode(machineModeString->String());
+                                       if (indexMachineMode < nMachineMode-1){
+                                               AliDCSArray* machineMode1 = (AliDCSArray*)machineModeArray->At(indexMachineMode+1);
+                                               if (machineMode1){
+                                                       if (machineMode1->GetTimeStamp()>timeStart && machineMode1->GetTimeStamp()<=timeEnd){
+                                                               timeMachineModeEnd = machineMode1->GetTimeStamp();
+                                                               TObjString* machineModeString1 = machineMode1->GetStringArray(0);
+                                                               TString mmString0 = machineModeString->String();
+                                                               TString mmString1 = machineModeString1->String();
+                                                               if (mmString0.CompareTo(mmString1.Data(),TString::kIgnoreCase) == -1){
+                                                                       AliWarning(Form("The machine mode changed from %s to %s during the run at timestamp %f! Setting it to %s and keeping track of the time of the change to set MaxTimeLHCValidity afterward",mmString0.Data(),mmString1.Data(),timeMachineModeEnd,mmString0.Data()));
+                                                                       flagMachineMode = kTRUE;
+                                                               }
+                                                       }
+                                               }
+                                               else {
+                                                       AliInfo("Invalid pointer for the first entry for Machine Mode after the first valid one, not considering anything after what has already been found");
+                                               }
+                                       }
+                               }
+                       }
+                       delete machineModeArray;
+               }
+               else{
+                       AliError("Machine mode array not found in LHC Data file!!!");
+               }
+               
+               // BeamType1 and BeamType2 - both put in the same string
+               Log("*************BeamType ");
+               TObjArray* beamArray = lhcReader.ReadSingleLHCDP(fileName.Data(),fgkLHCDataPoints[3]);
+               if (beamArray){                 
+                       Int_t nBeam = beamArray->GetEntries();
+                       if (nBeam==0){
+                               AliInfo("No Beam Type found, leaving it empty");
+                       }
+                       else{
+                               for (Int_t iBeam = 0; iBeam<nBeam; iBeam++){
+                                       AliDCSArray* beam = (AliDCSArray*)beamArray->At(iBeam);
+                                       if (beam){
+                                               if (beam->GetTimeStamp()<=timeStart && beam->GetTimeStamp()>=timeBeamStart){// taking always the very last entry: of two measurements have the same timestamp, the last one is taken
+                                                       timeBeamStart = beam->GetTimeStamp();
+                                                       indexBeam = iBeam;
+                                                       foundBeamStart = kTRUE;
+                                               }
+                                               else{
+                                                       break;
+                                               }
+                                       }
+                               }
+                               if (!foundBeamStart){
+                                       AliInfo("No value for the Beam Type found before start of run, the Machine Mode will remain empty");
+                               }
+                               else {
+                                       AliDCSArray* beam = (AliDCSArray*)beamArray->At(indexBeam);
+                                       TObjString* beamString = beam->GetStringArray(0);
+                                       TString beamType = beamString->String();
+                                       AliInfo(Form("Beam Type = %s",beamType.Data()));        
+                                       if (beamType.CompareTo("PROTON",TString::kIgnoreCase) == 0){
+                                               AliInfo("Setting beam type to p-p");
+                                               grpobj->SetBeamType("p-p");
+                                       }
+                                       else { // if there is no PROTON beam, we suppose it is Pb, and we put A-A
+                                               AliInfo("Setting beam type to A-A");
+                                               grpobj->SetBeamType("A-A");
+                                       }
+                                       /*
+                                         else if (beamType.CompareTo("LEAD82",TString::kIgnoreCase) == 0){
+                                               AliInfo("Setting beam type to Pb-Pb");
+                                               grpobj->SetBeamType("Pb-Pb");
+                                       }
+                                       else{
+                                               AliError("Beam Type not known, leaving it empty");
+                                       }
+                                       */
+                                       if (indexBeam < nBeam-1){
+                                               AliDCSArray* beam1 = (AliDCSArray*)beamArray->At(indexBeam+1);
+                                               if (beam1){
+                                                       if (beam1->GetTimeStamp()>timeStart && beam1->GetTimeStamp()<=timeEnd){
+                                                               timeBeamEnd = beam1->GetTimeStamp();
+                                                               TObjString* beamString1 = beam1->GetStringArray(0);
+                                                               TString beamType1 = beamString1->String();
+                                                               if (beamType.CompareTo(beamType1.Data(),TString::kIgnoreCase) == -1){
+                                                                       AliWarning(Form("The Beam Type changed from %s to %s during the run at timestamp %f! Setting it to %s and keeping track of the time of the change to set MaxTimeLHCValidity afterward",beamType.Data(),(beamString1->String()).Data(),timeBeamEnd,beamType.Data()));
+                                                                       flagBeam = kTRUE;
+                                                               }
+                                                       }
+                                               }
+                                               else {
+                                                       AliInfo("Invalid pointer for the first entry for Beam Type after the first valid one, not considering anything after what has already been found");
+                                               }
+                                       }
+                               }
+                       }
+                       delete beamArray;
+               }
+               else{
+                       AliError("Beam Type array not found in LHC Data file!!!");
+               }               
+               
+               // Setting minTimeLHCValidity
+               if (timeBeamModeEnd!=0 || timeMachineModeEnd!=0 || timeBeamEnd !=0){
+                       Double_t minTimeLHCValidity;
+                       if (flagBeamMode == kFALSE && flagMachineMode == kFALSE && flagBeam == kTRUE){ // flagBeam only true
+                               minTimeLHCValidity = timeBeamEnd;
+                       }
+                       else if (flagBeamMode == kFALSE && flagMachineMode == kTRUE && flagBeam == kFALSE){ // flagMachineMode only true
+                               minTimeLHCValidity = timeMachineModeEnd;
+                       }
+                       else if (flagBeamMode == kTRUE && flagMachineMode == kFALSE && flagBeam == kFALSE){ // flagBeamMode only true
+                               minTimeLHCValidity = timeBeamModeEnd;
+                       }
+                       else if (flagBeamMode == kFALSE && flagMachineMode == kTRUE && flagBeam == kTRUE){ // flagBeam and flagMachineMode only true
+                               minTimeLHCValidity= TMath::Min(timeBeamEnd,timeMachineModeEnd);
+                       }
+                       else if (flagBeamMode == kTRUE && flagMachineMode == kFALSE && flagBeam == kTRUE){ // flagBeam and flagBeamMode only true
+                               minTimeLHCValidity= TMath::Min(timeBeamEnd,timeBeamModeEnd);
+                       }
+                       else if (flagBeamMode == kTRUE && flagMachineMode == kTRUE && flagBeam == kFALSE){ // flagMachineMode and flagBeamMode only true
+                               minTimeLHCValidity= TMath::Min(timeMachineModeEnd,timeBeamModeEnd);
+                       }
+                       else {
+                               Double_t arrayTimes[3] = {timeBeamModeEnd,timeMachineModeEnd,timeBeamEnd};// flagMachineMode and flagBeamMode and flagBeam 
+                               minTimeLHCValidity= TMath::MinElement(3,arrayTimes);
+                       }
+                       AliWarning(Form("Setting MaxTimeLHCValidity to %f",minTimeLHCValidity));
+                       grpobj->SetMaxTimeLHCValidity(minTimeLHCValidity);
+               }
+               
+               // Processing data to go to AliLHCData object
+               AliLHCData* dt = new AliLHCData(fileName.Data(),timeStart,timeEnd);
+               // storing AliLHCData in OCDB
+               if (dt){
+                 AliInfo(Form("Filled %d records to AliLHCData object",dt->GetData().GetEntriesFast()));
+                 AliCDBMetaData md;
+                 md.SetResponsible("Ruben Shahoyan");
+                 md.SetComment("LHC data from the GRP preprocessor.");
+                 Bool_t result = kTRUE;
+                 result = Store("GRP", "LHCData", dt, &md); 
+                 delete dt;
+                 if (!result){
+                       Log(Form("Problems in storing LHC Data - but not going into Error"));
+                 }
+               }
+
+               // processing LHC Phase
+
+               TObjArray *beam1phase = lhcReader.ReadSingleLHCDP(fileName.Data(),fgkLHCDataPoints[4]);
+               TObjArray *beam2phase = lhcReader.ReadSingleLHCDP(fileName.Data(),fgkLHCDataPoints[5]);
+               if (beam1phase == 0x0 || beam2phase == 0x0){
+                       Log(Form("Problems in retrieving LHC Clock data from LHC file"));
+                       return 4;
+               }                       
+               AliLHCClockPhase *phaseObj = ProcessLHCClockPhase(beam1phase,beam2phase,timeEnd);
+               if (phaseObj){
+                       AliInfo(Form("LHC Phase found"));
+                       AliCDBMetaData mdPhase;
+                       mdPhase.SetResponsible("Cvetan Cheshkov");
+                       mdPhase.SetComment("LHC Clock Phase");
+                       Bool_t result = kTRUE;
+                       result = Store("Calib", "LHCClockPhase", phaseObj, &mdPhase); 
+                       delete phaseObj;
+                       if (!result) return 3;
+               }
+               else return 4;
+       }
+       
+       else {
+               AliError("No LHCData file found in DCS FXS");
+               return 1;
+       }
+
+       return 0;
+}
+
+//_______________________________________________________________
+
+UInt_t AliGRPPreprocessor::ProcessSPDMeanVertex()
+{
+       //
+       //Getting the SPD Mean Vertex
+       //
+
+       TList* list = GetForeignFileSources("SPD", kDAQ, "VertexDiamond");
+       Bool_t storeResult = kTRUE;
+       if (list !=0x0 && list->GetEntries()!=0)
+               {
+                       AliInfo("The following sources produced files with the id VertexDiamond from SPD");
+                       list->Print();
+                       for (Int_t jj=0;jj<list->GetEntries();jj++){
+                               TObjString * str = dynamic_cast<TObjString*> (list->At(jj));
+                               AliInfo(Form("found source %s", str->String().Data()));
+                               TString fileNameRun = GetForeignFile("SPD", kDAQ, "VertexDiamond", str->GetName());
+                               if (fileNameRun.Length()>0){
+                                       AliInfo(Form("Got the file %s", fileNameRun.Data()));
+                                       TFile daqFile(fileNameRun.Data(),"READ");
+                                       if (daqFile.IsOpen()) {
+                                               AliESDVertex* meanVtx = dynamic_cast<AliESDVertex*>(daqFile.Get("MeanVertexPos"));
+                                               if (meanVtx){
+                                                       meanVtx->Print();       
+                                                       // storing in the OCDB 
+                                                       AliCDBMetaData md;
+                                                       md.SetResponsible("Cvetan Cheshkov");
+                                                       md.SetComment("SPD Mean Vertex");                                       
+                                                       storeResult = Store("Calib", "MeanVertexSPD", meanVtx, &md, 0, kTRUE); 
+                                               }
+                                               else{
+                                                       AliWarning("No SPD Mean Vertex object found in file");
+                                               } 
+                                       }
+                                       else {
+                                               AliError("Can't open file");
+                                               storeResult = kFALSE;
+                                       }
+                               }
+                               else{
+                                       AliWarning("No file found for current source for SPD Mean Vertex");
+                               }
+                       }
+               }
+       else {
+               AliWarning("No list found for SPD Mean Vertex");
+       }
+
+       if (list) delete list;
+
+       return storeResult;
 }
 
+
 //_______________________________________________________________
 
 Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
@@ -443,7 +1093,7 @@ Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
                nparameter++;
        } 
        else {
-               Log(Form("Start time not put in logbook, setting to invalid in GRP entry!"));
+               Log(Form("Start time not put in logbook, setting to invalid in GRP entry, and causing an error!"));
        }
 
        if (timeEnd != 0){
@@ -452,33 +1102,22 @@ Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
                nparameter++;
        } 
        else {
-               Log(Form("End time not put in logbook, setting to invalid in GRP entry!"));
+               Log(Form("End time not put in logbook, setting to invalid in GRP entry, and causing an error!"));
        }
 
        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
-               }
+               Log(Form("Beam Energy for run %d: %f (NOT USING IT TO FILL THE GRP OBJECT, taking it from the LHC file)",fRun, beamEnergy));
        } 
        else {
-               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 Energy not put in logbook, but not using it anyway for the GRP object (taking it from the LHC file)"));
        }
 
                
        if (beamType.Length() != 0){
-               grpObj->SetBeamType(beamType);
-               Log(Form("Beam Type for run %d: %s",fRun, beamType.Data()));
-               nparameter++; 
+               Log(Form("Beam Type for run %d: %s (NOT USING IT TO FILL THE GRP OBJECT, taking it from the LHC file)",fRun, beamType.Data()));
        } 
        else {
-               Log(Form("Beam Type not put in logbook, setting to invalid in GRP entry!"));
+               Log(Form("Beam Type not put in logbook, but not using it anyway for the GRP entry (taking it from the LHC file)"));
        }
                
        if (numberOfDetectors != 0){
@@ -487,7 +1126,7 @@ Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
                nparameter++;
        } 
        else {
-               Log(Form("Number Of Detectors not put in logbook, setting to invalid in GRP entry!"));
+               Log(Form("Number Of Detectors not put in logbook, setting to invalid in GRP entry, and causing an error!"));
        }
 
        if (detectorMask != 0){
@@ -496,7 +1135,7 @@ Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
                nparameter++;
        } 
        else {
-               Log(Form("Detector Mask not put in logbook, setting to invalid in GRP entry!"));
+               Log(Form("Detector Mask not put in logbook, setting to invalid in GRP entry, and causing an error!"));
        }
 
        if (lhcPeriod.Length() != 0) {
@@ -505,7 +1144,7 @@ Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
                nparameter++;
        } 
        else {
-               Log(Form("LHCperiod not put in logbook, setting to invalid in GRP entry!"));
+               Log(Form("LHCperiod not put in logbook, setting to invalid in GRP entry, and causing an error!"));
        }
        if (runType.Length() != 0) {
                grpObj->SetRunType(runType);
@@ -513,7 +1152,7 @@ Int_t AliGRPPreprocessor::ProcessDaqLB(AliGRPObject* grpObj)
                nparameter++;
        } 
        else {
-               Log(Form("Run Type not put in logbook, setting to invalid in GRP entry!"));
+               Log(Form("Run Type not put in logbook, setting to invalid in GRP entry, and causing an error!"));
        }
 
        return nparameter;
@@ -525,7 +1164,7 @@ UInt_t AliGRPPreprocessor::ProcessDaqFxs()
 {
        //======DAQ FXS======//
        
-       //      AliRawEventHeaderV3_9::Class()->IgnoreTObjectStreamer(); // to avoid trying reading TObject store in AliRawEventHeaderV3_9 - temporary fix 
+       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!");
@@ -614,7 +1253,7 @@ UInt_t AliGRPPreprocessor::ProcessDcsFxs(TString partition, TString detector)
        // Get the CTP counters information
 
        if (partition.IsNull() && !detector.IsNull()){ // standalone partition
-               Log("STANDALONE partition for current run, using Trigger Configuration dummy value");
+               Log("STANDALONE partition for current run, using Trigger Scalers dummy value");
                AliCDBEntry *cdbEntry = GetFromOCDB("CTP","DummyScalers");
                if (!cdbEntry) {
                        Log(Form("No dummy CTP scalers entry found, going into error..."));
@@ -659,9 +1298,11 @@ UInt_t AliGRPPreprocessor::ProcessDcsFxs(TString partition, TString detector)
                                metaData.SetComment("CTP scalers");
                                if (!Store("CTP","Scalers", scalers, &metaData, 0, 0)) {
                                        Log("Unable to store the CTP scalers object to OCDB!");
+                                       delete scalers;                                 
                                        return 1;
                                }
                        }
+                       delete scalers;
                }
        }
        
@@ -684,18 +1325,17 @@ Int_t AliGRPPreprocessor::ProcessDcsDPs(TMap* valueMap, AliGRPObject* grpObj)
        //
 
        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;
        Int_t nEnvEntries = 0;
        Int_t nHallProbesEntries = 0;
-       nLHCEntries = ProcessLHCDPs(valueMap, grpObj);
        nL3Entries = ProcessL3DPs(valueMap, grpObj);
        nDipoleEntries = ProcessDipoleDPs(valueMap, grpObj);
        nEnvEntries = ProcessEnvDPs(valueMap, grpObj);
        nHallProbesEntries = ProcessHPDPs(valueMap, grpObj);
-
-       entries = nLHCEntries + nL3Entries + nDipoleEntries + nEnvEntries + nHallProbesEntries;
+       grpObj->SetPolarityConventionLHC();  // after the dipole cables swap we comply with LHC convention
+       Log(Form("L3Entries = %d, nDipoleEntries =%d, nEnvEntries = %d, nHallProbesEntries = %d", nL3Entries, nDipoleEntries, nEnvEntries, nHallProbesEntries));
+       entries = nL3Entries + nDipoleEntries + nEnvEntries + nHallProbesEntries;
        return entries;
 
 }
@@ -710,6 +1350,7 @@ Int_t AliGRPPreprocessor::ProcessL3DPs(const TMap* valueMap, AliGRPObject* grpOb
        // 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
@@ -738,7 +1379,10 @@ Int_t AliGRPPreprocessor::ProcessL3DPs(const TMap* valueMap, AliGRPObject* grpOb
                                floatDCS = 0x0;
                        }
                }
-               if (!outOfRange) nL3Entries++;
+               if (!outOfRange) {
+                       nL3Entries++;
+                       ffailedDPs->RemoveAt(indexDP);
+               }
        }
 
        if (array) array = 0x0;
@@ -759,10 +1403,12 @@ Int_t AliGRPPreprocessor::ProcessL3DPs(const TMap* valueMap, AliGRPObject* grpOb
                        if (change == kFALSE){
                                grpObj->SetL3Polarity(charDCS);
                                AliInfo(Form("%s set to %d",fgkDCSDataPoints[indexDP],(Int_t)(grpObj->GetL3Polarity())));
+                               ffailedDPs->RemoveAt(indexDP);
                                nL3Entries++;
                        }
                        else if (isZero){
                                AliInfo(Form("%s set to invalid, but magnet was OFF (according to the current), DP not considered wrong",fgkDCSDataPoints[indexDP]));
+                               ffailedDPs->RemoveAt(indexDP);
                                nL3Entries++;
                        }
                        else {
@@ -811,7 +1457,10 @@ Int_t AliGRPPreprocessor::ProcessDipoleDPs(const TMap* valueMap, AliGRPObject* g
                                floatDCS = 0x0;
                        }
                }
-               if (!outOfRange) nDipoleEntries++;
+               if (!outOfRange) {
+                       nDipoleEntries++;
+                       ffailedDPs->RemoveAt(indexDP);
+               }
        }
 
        if (array) array = 0x0;
@@ -832,10 +1481,12 @@ Int_t AliGRPPreprocessor::ProcessDipoleDPs(const TMap* valueMap, AliGRPObject* g
                        if (!change){
                                grpObj->SetDipolePolarity(charDCS);
                                AliInfo(Form("%s set to %d",fgkDCSDataPoints[indexDP],(Int_t)(grpObj->GetDipolePolarity())));
+                               ffailedDPs->RemoveAt(indexDP);
                                nDipoleEntries++;
                        }
                        else if (isZero){
                                AliInfo(Form("%s set to invalid, but magnet was OFF (according to the current), DP not considered wrong",fgkDCSDataPoints[indexDP]));
+                               ffailedDPs->RemoveAt(indexDP);
                                nDipoleEntries++;
                        }
                        else{
@@ -883,47 +1534,95 @@ Int_t AliGRPPreprocessor::ProcessEnvDPs(TMap* valueMap, AliGRPObject* grpObj)
                                floatDCS = 0x0;
                        }
                }
-               if (!outOfRange) nEnvEntries++;
+               if (!outOfRange) {
+                       ffailedDPs->RemoveAt(indexDP);
+                       nEnvEntries++;
+               }
        }
 
        if (array) array = 0x0;
 
-       AliInfo(Form("==========AtmosPressures (Cavern + Surface)==========="));
+       AliInfo(Form("========== AtmosPressures (Cavern + Surface + Cavern2) ==========="));
        AliDCSSensorArray *dcsSensorArray = GetPressureMap(valueMap);
-       dcsSensorArray->Print();
-       if( fPressure->NumFits()==0 ) {
-               Log("Problem with the pressure sensor values!!!");
+       //dcsSensorArray->Print();
+       if( fPressure->NumFits()<kNumSensors ) {
+               Log(Form("Check the pressure sensor values! Not all the %d pressure sensors have been fit",kNumSensors));
        } 
-       else {
-               AliInfo(Form("==========CavernAtmosPressure==========="));
-               indexDP = kCavernAtmosPressure;
-               AliDCSSensor* sensorCavernP2 = dcsSensorArray->GetSensor(fgkDCSDataPoints[indexDP]);
-               AliDebug(2,Form("sensorCavernP2 = %p", sensorCavernP2));
-               if( sensorCavernP2->GetFit() ) {
-                       Log(Form("<%s> for run %d: Sensor Fit found",fgkDCSDataPoints[indexDP], fRun));
-                       grpObj->SetCavernAtmosPressure(sensorCavernP2);
-                       nEnvEntries++;
-               } 
-               //if (sensorP2) delete sensorP2;
+       Log(Form("Number of fits performed = %d",fPressure->NumFits()));
+
+       AliInfo(Form("==========CavernAtmosPressure==========="));
+       indexDP = kCavernAtmosPressure;
+       AliDCSSensor* sensorCavernP2 = dcsSensorArray->GetSensor(fgkDCSDataPoints[indexDP]);
+       TGraph* graph = sensorCavernP2->GetGraph();
+       AliDebug(3,Form("index = %d",indexDP));
+       AliDebug(3,Form("name = %s",fgkDCSDataPoints[indexDP]));
+       AliDebug(2,Form("graph = %p",graph));
+       AliDebug(3,Form("sensorCavernP2 = %p", sensorCavernP2));
+       if(sensorCavernP2->GetFit() || graph) {
+               if (sensorCavernP2->GetFit()){
+                       Log(Form("Fit for sensor %s found",fgkDCSDataPoints[indexDP]));
+               }
                else {
-                       Log(Form("ERROR Sensor Fit for %s not found ", fgkDCSDataPoints[indexDP] ));
-               }
-               AliInfo(Form("==========SurfaceAtmosPressure==========="));
-               indexDP = kSurfaceAtmosPressure;
-               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;
+                       Log(Form("Fit for sensor %s not found, but the graph is there - NOT going into error",fgkDCSDataPoints[indexDP]));
+               }
+               grpObj->SetCavernAtmosPressure(sensorCavernP2);
+               ffailedDPs->RemoveAt(indexDP);
+               nEnvEntries++;
+       } 
+       //if (sensorP2) delete sensorP2;
+       else {
+               Log(Form("ERROR!!! Neither graph nor fit found for sensor %s - this will not increase the number of found DCS DPs and will cause an error", fgkDCSDataPoints[indexDP] ));
+       }
+       
+       AliInfo(Form("==========SurfaceAtmosPressure==========="));
+       indexDP = kSurfaceAtmosPressure;
+       AliDCSSensor* sensorP2 = dcsSensorArray->GetSensor(fgkDCSDataPoints[indexDP]);
+       graph = sensorP2->GetGraph();
+       AliDebug(3,Form("index = %d",indexDP));
+       AliDebug(3,Form("name = %s",fgkDCSDataPoints[indexDP]));
+       AliDebug(2,Form("graph = %p",graph));   
+       AliDebug(3,Form("sensorP2 = %p", sensorP2));
+       if(sensorP2->GetFit() || graph) {
+               if (sensorP2->GetFit()){
+                       Log(Form("Fit for sensor %s found",fgkDCSDataPoints[indexDP]));
+               }
                else {
-                       Log(Form("ERROR Sensor Fit for %s not found ", fgkDCSDataPoints[indexDP] ));
+                       Log(Form("Fit for sensor %s not found, but the graph is there - NOT going into error",fgkDCSDataPoints[indexDP]));
                }
-               
+               grpObj->SetSurfaceAtmosPressure(sensorP2);
+               ffailedDPs->RemoveAt(indexDP);
+               nEnvEntries++;
+       } 
+       //if (sensorP2) delete sensorP2;
+       else {
+               Log(Form("ERROR!!! Neither graph nor fit found for sensor %s - this will not increase the number of found DCS DPs and will cause an error", fgkDCSDataPoints[indexDP] ));
        }
 
+       AliInfo(Form("==========CavernAtmosPressure2==========="));
+       indexDP = kCavernAtmosPressure2;
+       AliDCSSensor* sensorCavernP22 = dcsSensorArray->GetSensor(fgkDCSDataPoints[indexDP]);
+       graph = sensorCavernP22->GetGraph();
+       AliDebug(3,Form("index = %d",indexDP));
+       AliDebug(3,Form("name = %s",fgkDCSDataPoints[indexDP]));
+       AliDebug(2,Form("graph = %p",graph));   
+       AliDebug(3,Form("sensorCavernP2_2 = %p", sensorCavernP22));
+       if(sensorCavernP22->GetFit() || graph) {
+               if (sensorCavernP22->GetFit()){
+                       Log(Form("Fit for sensor %s found",fgkDCSDataPoints[indexDP]));
+               }
+               else {
+                       Log(Form("Fit for sensor %s not found, but the graph is there - NOT going into error",fgkDCSDataPoints[indexDP]));
+               }
+               grpObj->SetCavernAtmosPressure2(sensorCavernP22);
+               ffailedDPs->RemoveAt(indexDP);
+               nEnvEntries++;
+       } 
+       //if (sensorP2) delete sensorP2;
+       else {
+               Log(Form("ERROR!!! Neither graph nor fit found for sensor %s - this will not increase the number of found DCS DPs and will cause an error", fgkDCSDataPoints[indexDP] ));
+       }
+       
+       
        return nEnvEntries;
 }
 //_______________________________________________________________
@@ -970,7 +1669,10 @@ Int_t AliGRPPreprocessor::ProcessHPDPs(const TMap* valueMap, AliGRPObject* grpOb
                                        floatDCS = 0x0;
                                }
                        }
-                       if (!outOfRange) nHPEntries++;
+                       if (!outOfRange) {
+                               ffailedDPs->RemoveAt(indexDP + fgkDCSDPHallTopShift);  // 7 = shift in the complete list of DPs to get to the Hall Probes
+                               nHPEntries++;
+                       }
                }
        }
                
@@ -978,134 +1680,14 @@ Int_t AliGRPPreprocessor::ProcessHPDPs(const TMap* valueMap, AliGRPObject* grpOb
        return nHPEntries;
 }
 
-//_______________________________________________________________
+//_________________________________________________________________________
 
-Int_t AliGRPPreprocessor::ProcessLHCDPs(const TMap* valueMap, AliGRPObject* grpObj)
-{
+AliSplineFit* AliGRPPreprocessor::GetSplineFit(const TObjArray *array, const TString& stringID){
 
-       //
-       // processing of LHC related DCS DPs, i.e.:
-       // LHCState
-       // LHCLuminosity
-       // BeamIntensity
-       //
 
-       Int_t nLHCEntries = 0;
-       TObjArray *array = 0x0;
-       Int_t indexDP = -1;
-
-       AliInfo(Form("==========LHCState==========="));
-       indexDP = kLHCState;
-       array = (TObjArray *)valueMap->GetValue(fgkDCSDataPoints[indexDP]);
-       if(!array) {
-               Log(Form("%s not found in the map!!!",fgkDCSDataPoints[indexDP]));
-       } 
-       else {
-               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());
-                               } 
-                       }
-                       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 {
-               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 {
-               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(const TObjArray *array, const TString& stringID){
-
-
-       // 
-       // returning Spline Fit 
-       // 
+       // 
+       // returning Spline Fit 
+       // 
 
        Int_t entriesarray = array->GetEntries();
        Float_t* value = new Float_t[entriesarray];
@@ -1175,19 +1757,36 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(const TObjArray* array)
        // parameters[4] = standard deviation wrt median
        //
 
+       TString timeStartString = (TString)GetRunParameter("DAQ_time_start");
+       TString timeEndString = (TString)GetRunParameter("DAQ_time_end");
+       if (timeStartString.IsNull() || timeStartString.IsNull()){
+               if (timeStartString.IsNull()){ 
+                       AliError("DAQ_time_start not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               else if (timeStartString.IsNull()){
+                       AliError("DAQ_time_end not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               fdaqStartEndTimeOk = kFALSE;
+               return 0;
+       }  
+
+       Int_t timeStart = (Int_t)(timeStartString.Atoi());
+       Int_t timeEnd = (Int_t)(timeEndString.Atoi());
        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 iCountsRun = 0;
        Int_t nCounts = array->GetEntries();
-       Float_t *tempArray = new Float_t[nCounts];
+       Float_t valueBeforeSOR = 0;
+       Float_t valueAfterEOR = 0;
+       Int_t timestampBeforeSOR = -1;
+       Int_t timestampAfterEOR = -1;
+       Int_t ientrySOR = -1;
+       Int_t ientryEOR = -1;
+       Float_t* arrayValues = 0x0; 
+       Double_t* arrayWeights = 0x0; 
+       Bool_t truncMeanFlag = kTRUE;  // flag to indicate whether Truncated Mean should be calculated or not
+       Bool_t sdFlag = kTRUE;  // flag to indicate whether SD (wrt Mean/Median) should be calculated or not
+
        for(Int_t i = 0; i < nCounts; i++) {
                AliDCSValue *v = (AliDCSValue *)array->At(i);
                if ((v->GetFloat() <= fminFloat) || (v->GetFloat() >= fmaxFloat)) {
@@ -1197,85 +1796,192 @@ Float_t* AliGRPPreprocessor::ProcessFloatAll(const TObjArray* array)
                        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]));
+                       AliDebug(2,Form("%d-th entry = %f at timestamp %i",i,v->GetFloat(),v->GetTimeStamp()));
                        iCounts += 1;
+                       // look for the last value before SOR and the first value before EOR
+                       if (((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) && (Int_t)(v->GetTimeStamp()) < timeStart) {
+                               timestampBeforeSOR = (Int_t)(v->GetTimeStamp());
+                               AliDebug(2,Form("timestamp of last value before SOR = %d, with DAQ_time_start = %d",timestampBeforeSOR,timeStart));
+                               valueBeforeSOR = v->GetFloat();
+                       }
+                       else if ((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery() && (Int_t)(v->GetTimeStamp()) > timeEnd && timestampAfterEOR == -1){
+                               timestampAfterEOR = (Int_t)(v->GetTimeStamp());
+                               valueAfterEOR = v->GetFloat();
+                               AliDebug(2,Form("timestamp of first value after EOR = %d, with DAQ_time_end = %d",timestampAfterEOR,timeEnd));
+                       }
+                       // check if there are DPs between DAQ_time_start and DAQ_time_end
+                       if(((Int_t)(v->GetTimeStamp()) >= timeStart) &&((Int_t)(v->GetTimeStamp()) <= timeEnd)) {
+                               if (ientrySOR == -1) ientrySOR = i;  // first entry after SOR
+                               if (ientryEOR < i) ientryEOR = i;  // last entry before EOR
+                               AliDebug(2,Form("entry between SOR and EOR"));
+                               iCountsRun += 1;
+                       }
                }
                else {
-                       AliError(Form("DCS values for the parameter outside the queried interval"));
+                       AliError(Form("DCS values for the parameter outside the queried interval: timestamp = %d",v->GetTimeStamp()));
                }
        }
 
-       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++){
+       if (timestampBeforeSOR == -1){
+               AliWarning("No value found before SOR");
+       }
+       if (timestampAfterEOR == -1){
+               AliWarning("No value found after EOR");
+       }
+
+       AliDebug(2,Form("Number of valid entries (within DCS query interval) = %i, from a total amount of %i entries",iCounts,nCounts));
+       AliDebug(2,Form("Last value before DAQ_time_start (SOR) = %f at timestamp = %d",valueBeforeSOR,timestampBeforeSOR));
+       AliDebug(2,Form("First value after DAQ_time_end (EOR)   = %f at timestamp = %d",valueAfterEOR,timestampAfterEOR));
+       AliInfo(Form("Found %d entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)",iCountsRun));
+       AliDebug(2,Form("Index of first entry after DAQ_time_start (SOR) = %d ",ientrySOR));
+       AliDebug(2,Form("Index of first entry before DAQ_time_end (EOR) = %d ",ientryEOR));
+
+       Int_t nentriesUsed = 0;
+       if (iCountsRun > 1){
+               AliInfo("Using entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)");
+               AliDebug(2,"Calculating (weighted) Mean and Median");
+               arrayValues = new Float_t[iCountsRun]; 
+               arrayWeights = new Double_t[iCountsRun]; 
+               nentriesUsed = iCountsRun;
+               for (Int_t i = ientrySOR; i <= ientryEOR; 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));
+                       Int_t timestamp2 = 0;
+                       if (i < ientryEOR){
+                               AliDCSValue *v1 = (AliDCSValue *)array->At(i+1);
+                               timestamp2 = (Int_t)v1->GetTimeStamp();
+                       }
+                       else {
+                               timestamp2 = timeEnd+1;
                        }
-                       temp += (v->GetFloat()-aDCSArrayMedian)*(v->GetFloat()-aDCSArrayMedian);
+                       arrayWeights[i-ientrySOR] = (Double_t)(timestamp2 - (Int_t)v->GetTimeStamp());
+                       arrayValues[i-ientrySOR] = v->GetFloat();
+               }
+               parameters[0] = TMath::Mean(iCountsRun,arrayValues,arrayWeights);
+               parameters[2] = TMath::Median(iCountsRun,arrayValues,arrayWeights);
+       }
+       else if (iCountsRun == 1){
+               AliDCSValue* v = (AliDCSValue *)array->At(ientrySOR);
+               nentriesUsed = 2;
+               if (timestampBeforeSOR != -1 && timestampBeforeSOR != (Int_t)v->GetTimeStamp()){
+                       AliWarning("Using single entry between DAQ_time_start (SOR) and DAQ_time_end (EOR) and last entry before SOR. Truncated mean won't be calculated.");
+                       arrayValues = new Float_t[2];
+                       arrayWeights = new Double_t[2];
+                       arrayValues[0] = valueBeforeSOR;
+                       arrayWeights[0] = (Double_t)((Int_t)v->GetTimeStamp()-timestampBeforeSOR);
+                       arrayValues[1] = v->GetFloat();
+                       arrayWeights[1] = (Double_t)(timeEnd+1-(Int_t)v->GetTimeStamp());
+                       AliDebug(2, Form("value0 = %f, with weight = %f",arrayValues[0],arrayWeights[0])); 
+                       AliDebug(2, Form("value1 = %f, with weight = %f",arrayValues[1],arrayWeights[1])); 
+                       parameters[0] = TMath::Mean(2,arrayValues,arrayWeights);
+                       parameters[2] = TMath::Median(2,arrayValues,arrayWeights);
+                       truncMeanFlag = kFALSE;
+               }
+               else{
+                       AliError("Cannot calculate mean, truncated mean, median, SD wrt mean, SD wrt median for current DP - only one value collected during the run, but no value before with which to calculate the statistical quantities");
+                       parameters[0] = AliGRPObject::GetInvalidFloat();
+                       parameters[1] = AliGRPObject::GetInvalidFloat();
+                       parameters[2] = AliGRPObject::GetInvalidFloat();
+                       parameters[3] = AliGRPObject::GetInvalidFloat();
+                       parameters[4] = AliGRPObject::GetInvalidFloat();
+                       return parameters;
+               }
+       }
+       else { // iCountsRun == 0, using only the point immediately before SOR
+               if (timestampBeforeSOR == -1){
+                       AliError("Cannot set mean, truncated mean, median, SD wrt mean, SD wrt median for current DP - no points during the run collected, and point before SOR missing");
+                       parameters[0] = AliGRPObject::GetInvalidFloat();
+                       parameters[1] = AliGRPObject::GetInvalidFloat();
+                       parameters[2] = AliGRPObject::GetInvalidFloat();
+                       parameters[3] = AliGRPObject::GetInvalidFloat();
+                       parameters[4] = AliGRPObject::GetInvalidFloat();
+                       return parameters;
                }
-               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 {
+                       AliWarning("Using only last entry before SOR. Truncated mean and Standard deviations (wrt mean/median) won't be calculated.");
+                       AliDebug(2,Form("value = %f",valueBeforeSOR)); 
+                       parameters[0] = valueBeforeSOR;
+                       parameters[2] = valueBeforeSOR;
+                       truncMeanFlag = kFALSE;
+                       sdFlag = kFALSE;
                }
-               else if (temp==0) {
-                       AliInfo(Form("Radical = 0 in computing standard deviation wrt median! Setting it to zero...."));
-                       aDCSArraySDMedian = 0;
+       }
+
+       Float_t temp = 0;
+       Float_t temp1 = 0;
+       Float_t sumweights = 0; 
+       Int_t entriesTruncMean = 0;
+       Float_t* arrayValuesTruncMean = new Float_t[nentriesUsed]; 
+       Double_t* arrayWeightsTruncMean = new Double_t[nentriesUsed]; 
+
+       // calculating SD wrt Mean and Median
+       AliDebug(2,"Calculating SD wrt Mean and SD wrt Median");
+       if (sdFlag){
+               for (Int_t i =0; i< nentriesUsed; i++){
+                       AliDebug(2,Form("Entry %d: value = %f, weight = %f",i,arrayValues[i],arrayWeights[i]));
+                       temp += (arrayValues[i]-parameters[2])*(arrayValues[i]-parameters[2]);
+                       temp1 += arrayWeights[i]*(arrayValues[i]-parameters[0])*(arrayValues[i]-parameters[0]);
+                       sumweights += arrayWeights[i];
+               }
+               // setting SD wrt Mean 
+               if (sumweights != 0 ){
+                       parameters[3] = TMath::Sqrt(temp1/sumweights);
+               }
+               else {
+                       AliError("Sum of weights to calculate Standard Deviation (wrt mean) <= 0, setting the SD to invalid");
+                       parameters[3] = AliGRPObject::GetInvalidFloat();
+               }
+               // setting SD wrt Median
+               if (nentriesUsed != 0){
+                       parameters[4] = TMath::Sqrt(temp/nentriesUsed);
                }
                else{
-                       AliError(Form("Radical < 0 in computing standard deviation! Setting it to invalid...."));
-                       aDCSArraySDMedian = AliGRPObject::GetInvalidFloat();
+                       AliError("Number of entries used to calculate Standard Deviation (wrt median) <= 0, setting the SD to invalid");
+                       parameters[4] = 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;
+               parameters[3] = AliGRPObject::GetInvalidFloat();
+               parameters[4] = AliGRPObject::GetInvalidFloat();
+       }               
+
+       // calculating truncated mean (this comes afterwards since you need the SD wrt Mean)
+       if (truncMeanFlag){
+               AliDebug(2,"Calculating Truncated Mean");
+               for (Int_t i =0; i< nentriesUsed; i++){
+                       AliDebug(2,Form("Entry %d: value = %f, weight = %f",i,arrayValues[i],arrayWeights[i]));
+                       if ((arrayValues[i]<=parameters[0]+3*parameters[3]) && (arrayValues[i]>=parameters[0]-3*parameters[3])){
+                               arrayValuesTruncMean[entriesTruncMean]=arrayValues[i];
+                               arrayWeightsTruncMean[entriesTruncMean]=arrayWeights[i];
+                               AliDebug(2,Form("For Truncated Mean: Entry %d: value = %f, weight = %f",entriesTruncMean,arrayValuesTruncMean[entriesTruncMean],arrayWeightsTruncMean[entriesTruncMean]));
+                               entriesTruncMean++;                     
+                       }
+                       else{
+                               AliDebug(2,"Discarding entry");
+                       }
+               }
+               // setting truncated mean 
+               if (entriesTruncMean >1){
+                       AliDebug(2,Form("%d entries used for truncated mean",entriesTruncMean));
+                       parameters[1] = TMath::Mean(entriesTruncMean,arrayValuesTruncMean,arrayWeightsTruncMean);
+               }
+               else{   
+                       AliDebug(2,Form("Too few entries (%d) to calculate truncated mean",entriesTruncMean));
+                       parameters[1] = AliGRPObject::GetInvalidFloat();
+               }
        }
        else{
-               aDCSArrayTruncMean = AliGRPObject::GetInvalidFloat();
+                       parameters[1] = 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]));
 
+       AliInfo(Form("(weighted) mean = %f ",parameters[0]));
+       AliInfo(Form("(weighted) truncated mean = %f ",parameters[1]));
+       AliInfo(Form("median = %f ",parameters[2]));
+       AliInfo(Form("(weighted) standard deviation with (weighted) mean = %f ",parameters[3]));
+       AliInfo(Form("standard deviation with median = %f ",parameters[4]));
+       
        return parameters;
 }
 
-
-
 //__________________________________________________________________________________________________________________
 
 Float_t* AliGRPPreprocessor::ProcessFloatAllMagnet(const TObjArray* array, Int_t indexDP, Bool_t &isZero)
@@ -1295,19 +2001,8 @@ Float_t* AliGRPPreprocessor::ProcessFloatAllMagnet(const TObjArray* array, Int_t
        //
 
        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)) {
@@ -1317,10 +2012,7 @@ Float_t* AliGRPPreprocessor::ProcessFloatAllMagnet(const TObjArray* array, Int_t
                        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;
+                       AliDebug(2,Form("%d-th entry = %f",i,v->GetFloat()));
                        if (indexDP == kL3Current && v->GetFloat() > 350 && isZero == kTRUE) isZero=kFALSE; 
                        if (indexDP == kDipoleCurrent && v->GetFloat() > 450 && isZero == kTRUE) isZero=kFALSE; 
                }
@@ -1329,71 +2021,7 @@ Float_t* AliGRPPreprocessor::ProcessFloatAllMagnet(const TObjArray* array, Int_t
                }
        }
 
-       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;
+       return ProcessFloatAll(array);
 }
 
 
@@ -1440,26 +2068,148 @@ Float_t AliGRPPreprocessor::ProcessInt(const TObjArray* array)
        // are outside the queried time interval or their value is out of range
        //
 
-       Float_t aDCSArraySum = 0.0;
+       TString timeStartString = (TString)GetRunParameter("DAQ_time_start");
+       TString timeEndString = (TString)GetRunParameter("DAQ_time_end");
+       if (timeStartString.IsNull() || timeStartString.IsNull()){
+               if (timeStartString.IsNull()){ 
+                       AliError("DAQ_time_start not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               else if (timeStartString.IsNull()){
+                       AliError("DAQ_time_end not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               return 0;
+       }  
+
+       Int_t timeStart = (Int_t)(timeStartString.Atoi());
+       Int_t timeEnd = (Int_t)(timeEndString.Atoi());
        Float_t aDCSArrayMean = 0.0;
        Int_t iCounts = 0;
-       AliDCSValue* v = 0x0;
+       Float_t valueBeforeSOR = 0;
+       Float_t valueAfterEOR = 0;
+       Int_t timestampBeforeSOR = -1;
+       Int_t timestampAfterEOR = -1;
+       Int_t ientrySOR = -1;
+       Int_t ientryEOR = -1;
+       Float_t* arrayValues = 0x0; 
+       Double_t* arrayWeights = 0x0; 
+       Int_t iCountsRun = 0;
+       Int_t nCounts = array->GetEntries();
 
-       for(Int_t iCount = 0; iCount < array->GetEntries(); iCount++) {
-               v = (AliDCSValue *)array->At(iCount);
+       for(Int_t i = 0; i < nCounts; i++) {
+               AliDCSValue* v = (AliDCSValue *)array->At(i);
                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()));
+                       AliError(Form("Error! Int value found in DCS map at %d-th entry is OUT OF RANGE: value = %d",i, v->GetInt()));
                        return AliGRPObject::GetInvalidFloat();
                }
                if(((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) &&((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery())) {
-                       aDCSArraySum += v->GetInt();
+                       AliDebug(2,Form("%d-th entry = %d at timestamp %i",i,v->GetInt(),v->GetTimeStamp()));
                        iCounts += 1;
+                       // look for the last value before SOR and the first value before EOR
+                       if (((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) && (Int_t)(v->GetTimeStamp()) < timeStart) {
+                               timestampBeforeSOR = (Int_t)(v->GetTimeStamp());
+                               AliDebug(2,Form("timestamp of last entry before SOR = %d, with DAQ_time_start = %d",timestampBeforeSOR,timeStart));
+                               valueBeforeSOR = (Float_t) v->GetInt();
+                       }
+                       else if ((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery() && (Int_t)(v->GetTimeStamp()) > timeEnd && timestampAfterEOR == -1){
+                               timestampAfterEOR = (Int_t)(v->GetTimeStamp());
+                               valueAfterEOR = (Float_t) v->GetInt();
+                               AliDebug(2,Form("timestamp of first entry after EOR = %d, with DAQ_time_end = %d",timestampAfterEOR,timeEnd));
+                       }
+                       // check if there are DPs between DAQ_time_start and DAQ_time_end
+                       if(((Int_t)(v->GetTimeStamp()) >= timeStart) &&((Int_t)(v->GetTimeStamp()) <= timeEnd)) {
+                               if (ientrySOR == -1) ientrySOR = i;  // first entry after SOR
+                               if (ientryEOR < i) ientryEOR = i;  // last entry before EOR
+                               AliDebug(2,Form("entry between SOR and EOR"));
+                               iCountsRun += 1;
+                       }
+               }
+               else {
+                       AliError(Form("DCS values for the parameter outside the queried interval: timestamp = %d",v->GetTimeStamp()));
                }
        }
 
-       if(iCounts != 0) aDCSArrayMean = aDCSArraySum/iCounts;
-       else aDCSArrayMean = AliGRPObject::GetInvalidFloat();
-       
+       if (timestampBeforeSOR == -1){
+               AliWarning("No value found before SOR!");
+       }
+       if (timestampAfterEOR == -1){
+               AliWarning("No value found after EOR!");
+       }
+
+       AliDebug(2,Form("Number of valid entries (within query interval) = %i, starting from %i entries",iCounts,nCounts));
+       AliDebug(2,Form("Last value before DAQ_time_start (SOR) = %f at timestamp = %d",valueBeforeSOR,timestampBeforeSOR));
+       AliDebug(2,Form("First value after DAQ_time_end (EOR)   = %f at timestamp = %d",valueAfterEOR,timestampAfterEOR));
+       AliInfo(Form("Found %d entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)",iCountsRun));
+       AliDebug(2,Form("Index of first entry after DAQ_time_start (SOR) = %d ",ientrySOR));
+       AliDebug(2,Form("Index of first entry before DAQ_time_end (EOR) = %d ",ientryEOR));
+
+       Int_t nentriesUsed = 0;
+       if (iCountsRun > 1){
+               AliInfo("Using entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)");
+               AliDebug(2,"Calculating (weighted) Mean");
+               arrayValues = new Float_t[iCountsRun]; 
+               arrayWeights = new Double_t[iCountsRun]; 
+               nentriesUsed = iCountsRun;
+               for (Int_t i = ientrySOR; i <= ientryEOR; i++){
+                       AliDCSValue *v = (AliDCSValue *)array->At(i);
+                       Int_t timestamp2 = 0;
+                       if (i < ientryEOR){
+                               AliDCSValue *v1 = (AliDCSValue *)array->At(i+1);
+                               timestamp2 = (Int_t)v1->GetTimeStamp();
+                       }
+                       else {
+                               timestamp2 = timeEnd+1;
+                       }
+                       arrayWeights[i-ientrySOR] = (Double_t)(timestamp2 - (Int_t)v->GetTimeStamp());
+                       arrayValues[i-ientrySOR] = (Float_t)v->GetInt();
+               }
+               aDCSArrayMean = TMath::Mean(iCountsRun,arrayValues,arrayWeights);
+       }
+       else if (iCountsRun == 1){
+               AliDCSValue* v = (AliDCSValue *)array->At(ientrySOR);
+               nentriesUsed = 2;
+               if (timestampBeforeSOR != -1 && timestampBeforeSOR != (Int_t)v->GetTimeStamp()){
+                       AliWarning("Using single entry between DAQ_time_start (SOR) and DAQ_time_end (EOR) and last entry before SOR.");
+                       arrayValues = new Float_t[2];
+                       arrayWeights = new Double_t[2];
+                       arrayValues[0] = valueBeforeSOR;
+                       arrayWeights[0] = (Double_t)((Int_t)v->GetTimeStamp()-timestampBeforeSOR);
+                       arrayValues[1] = (Float_t)v->GetInt();
+                       arrayWeights[1] = (Double_t)(timeEnd+1-(Int_t)v->GetTimeStamp());
+                       AliDebug(2,Form("value0 = %f, with weight = %f",arrayValues[0],arrayWeights[0])); 
+                       AliDebug(2,Form("value1 = %f, with weight = %f",arrayValues[1],arrayWeights[1])); 
+                       aDCSArrayMean = TMath::Mean(2,arrayValues,arrayWeights);
+               }
+               else{
+                       AliError("Cannot calculate mean - only one value collected during the run, but no value before with which to calculate the statistical quantities");
+                       return AliGRPObject::GetInvalidFloat();
+               }
+       }
+       else { // iCountsRun == 0, using the point immediately before SOR and the one immediately after EOR
+               if (timestampBeforeSOR == -1 || timestampAfterEOR == -1){
+                       if (timestampBeforeSOR == -1){
+                               AliError("Cannot calculate mean - no points during the run collected, and point before SOR missing");
+                       }
+                       if (timestampAfterEOR == -1){
+                               AliError("Cannot calculate maen - no points during the run collected, and point after EOR missing");
+                       }
+                       return AliGRPObject::GetInvalidFloat();
+               }
+               else {
+                       AliWarning("Using last entry before SOR and first entry after EOR.");
+                       nentriesUsed = 2;
+                       arrayValues = new Float_t[2];
+                       arrayWeights = new Double_t[2];
+                       arrayValues[0] = valueBeforeSOR;
+                       arrayWeights[0] = (Double_t)(timestampAfterEOR - timestampBeforeSOR);
+                       arrayValues[1] = valueAfterEOR;
+                       arrayWeights[1] = 1.;
+                       AliDebug(2,Form("value0 = %f, with weight = %f",arrayValues[0],arrayWeights[0])); 
+                       AliDebug(2,Form("value1 = %f, with weight = %f",arrayValues[1],arrayWeights[1])); 
+                       aDCSArrayMean = TMath::Mean(1,arrayValues,arrayWeights);
+               }
+       }
+
+       AliInfo(Form("mean = %f ", aDCSArrayMean));
        return aDCSArrayMean;
 
 }
@@ -1473,26 +2223,148 @@ Float_t AliGRPPreprocessor::ProcessUInt(const TObjArray* array)
        // are outside the queried time interval or their value is out of range
        //
 
-       Float_t aDCSArraySum = 0.0;
+       TString timeStartString = (TString)GetRunParameter("DAQ_time_start");
+       TString timeEndString = (TString)GetRunParameter("DAQ_time_end");
+       if (timeStartString.IsNull() || timeStartString.IsNull()){
+               if (timeStartString.IsNull()){ 
+                       AliError("DAQ_time_start not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               else if (timeStartString.IsNull()){
+                       AliError("DAQ_time_end not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               return 0;
+       }  
+
+       Int_t timeStart = (Int_t)(timeStartString.Atoi());
+       Int_t timeEnd = (Int_t)(timeEndString.Atoi());
        Float_t aDCSArrayMean = 0.0;
        Int_t iCounts = 0;
-       AliDCSValue* v = 0x0;
+       Float_t valueBeforeSOR = 0;
+       Float_t valueAfterEOR = 0;
+       Int_t timestampBeforeSOR = -1;
+       Int_t timestampAfterEOR = -1;
+       Int_t ientrySOR = -1;
+       Int_t ientryEOR = -1;
+       Float_t* arrayValues = 0x0; 
+       Double_t* arrayWeights = 0x0; 
+       Int_t iCountsRun = 0;
+       Int_t nCounts = array->GetEntries();
 
-       for(Int_t iCount = 0; iCount < array->GetEntries(); iCount++) {
-               v = (AliDCSValue *)array->At(iCount);
+       for(Int_t i = 0; i < nCounts; i++) {
+               AliDCSValue* v = (AliDCSValue *)array->At(i);
                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()));
+                       AliError(Form("Error! UInt value found in DCS map at %d-th entry is OUT OF RANGE: value = %u",i,v->GetUInt()));
                        return AliGRPObject::GetInvalidFloat();
                }
                if(((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) &&((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery())) {
-                       aDCSArraySum += v->GetUInt();
+                       AliDebug(2,Form("%d-th entry = %d at timestamp %i",i,v->GetUInt(),v->GetTimeStamp()));
                        iCounts += 1;
+                       // look for the last value before SOR and the first value before EOR
+                       if (((Int_t)(v->GetTimeStamp()) >= (Int_t)GetStartTimeDCSQuery()) && (Int_t)(v->GetTimeStamp()) < timeStart) {
+                               timestampBeforeSOR = (Int_t)(v->GetTimeStamp());
+                               AliDebug(2,Form("timestamp of last entry before SOR = %d, with DAQ_time_start = %d",timestampBeforeSOR,timeStart));
+                               valueBeforeSOR = (Float_t)v->GetUInt();
+                       }
+                       else if ((Int_t)(v->GetTimeStamp()) <= (Int_t)GetEndTimeDCSQuery() && (Int_t)(v->GetTimeStamp()) > timeEnd && timestampAfterEOR == -1){
+                               timestampAfterEOR = (Int_t)(v->GetTimeStamp());
+                               valueAfterEOR = (Float_t)v->GetUInt();
+                               AliDebug(2,Form("timestamp of first entry after EOR = %d, with DAQ_time_end = %d",timestampAfterEOR,timeEnd));
+                       }
+                       // check if there are DPs between DAQ_time_start and DAQ_time_end
+                       if(((Int_t)(v->GetTimeStamp()) >= timeStart) &&((Int_t)(v->GetTimeStamp()) <= timeEnd)) {
+                               if (ientrySOR == -1) ientrySOR = i;  // first entry after SOR
+                               if (ientryEOR < i) ientryEOR = i;  // last entry before EOR
+                               AliDebug(2,Form("entry between SOR and EOR"));
+                               iCountsRun += 1;
+                       }
+               }
+               else {
+                       AliError(Form("DCS values for the parameter outside the queried interval: timestamp = %d",v->GetTimeStamp()));
                }
        }
 
-       if(iCounts != 0) aDCSArrayMean = aDCSArraySum/iCounts;
-       else aDCSArrayMean = AliGRPObject::GetInvalidFloat();
-       
+       if (timestampBeforeSOR == -1){
+               AliWarning("No value found before SOR!");
+       }
+       if (timestampAfterEOR == -1){
+               AliWarning("No value found after EOR!");
+       }
+
+       AliDebug(2,Form("Number of valid entries (within query interval) = %i, starting from %i entries",iCounts,nCounts));
+       AliDebug(2,Form("Last value before DAQ_time_start (SOR) = %f at timestamp = %d",valueBeforeSOR,timestampBeforeSOR));
+       AliDebug(2,Form("First value after DAQ_time_end (EOR)   = %f at timestamp = %d",valueAfterEOR,timestampAfterEOR));
+       AliInfo(Form("Found %d entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)",iCountsRun));
+       AliDebug(2,Form("Index of first entry after DAQ_time_start (SOR) = %d ",ientrySOR));
+       AliDebug(2,Form("Index of first entry before DAQ_time_end (EOR) = %d ",ientryEOR));
+
+       Int_t nentriesUsed = 0;
+       if (iCountsRun > 1){
+               AliInfo("Using entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)");
+               AliDebug(2,"Calculating (weighted) Mean");
+               arrayValues = new Float_t[iCountsRun]; 
+               arrayWeights = new Double_t[iCountsRun]; 
+               nentriesUsed = iCountsRun;
+               for (Int_t i = ientrySOR; i <= ientryEOR; i++){
+                       AliDCSValue *v = (AliDCSValue *)array->At(i);
+                       Int_t timestamp2 = 0;
+                       if (i < ientryEOR){
+                               AliDCSValue *v1 = (AliDCSValue *)array->At(i+1);
+                               timestamp2 = (Int_t)v1->GetTimeStamp();
+                       }
+                       else {
+                               timestamp2 = timeEnd+1;
+                       }
+                       arrayWeights[i-ientrySOR] = (Double_t)(timestamp2 - (Int_t)v->GetTimeStamp());
+                       arrayValues[i-ientrySOR] = (Float_t)v->GetUInt();
+               }
+               aDCSArrayMean = TMath::Mean(iCountsRun,arrayValues,arrayWeights);
+       }
+       else if (iCountsRun == 1){
+               AliDCSValue* v = (AliDCSValue *)array->At(ientrySOR);
+               nentriesUsed = 2;
+               if (timestampBeforeSOR != -1 && timestampBeforeSOR != (Int_t)v->GetTimeStamp()){
+                       AliWarning("Using single entry between DAQ_time_start (SOR) and DAQ_time_end (EOR) and last entry before SOR.");
+                       arrayValues = new Float_t[2];
+                       arrayWeights = new Double_t[2];
+                       arrayValues[0] = valueBeforeSOR;
+                       arrayWeights[0] = (Double_t)((Int_t)v->GetTimeStamp()-timestampBeforeSOR);
+                       arrayValues[1] = (Float_t)v->GetUInt();
+                       arrayWeights[1] = (Double_t)(timeEnd+1-(Int_t)v->GetTimeStamp());
+                       AliDebug(2,Form("value0 = %f, with weight = %f",arrayValues[0],arrayWeights[0])); 
+                       AliDebug(2,Form("value1 = %f, with weight = %f",arrayValues[1],arrayWeights[1])); 
+                       aDCSArrayMean = TMath::Mean(2,arrayValues,arrayWeights);
+               }
+               else{
+                       AliError("Cannot calculate mean - only one value collected during the run, but no value before with which to calculate the statistical quantities");
+                       return AliGRPObject::GetInvalidFloat();
+               }
+       }
+       else { // iCountsRun == 0, using the point immediately before SOR and the one immediately after EOR
+               if (timestampBeforeSOR == -1 || timestampAfterEOR == -1){
+                       if (timestampBeforeSOR == -1){
+                               AliError("Cannot calculate mean - no points during the run collected, and point before SOR missing");
+                       }
+                       if (timestampAfterEOR == -1){
+                               AliError("Cannot calculate maen - no points during the run collected, and point after EOR missing");
+                       }
+                       return AliGRPObject::GetInvalidFloat();
+               }
+               else {
+                       AliWarning("Using last entry before SOR and first entry after EOR.");
+                       nentriesUsed = 2;
+                       arrayValues = new Float_t[2];
+                       arrayWeights = new Double_t[2];
+                       arrayValues[0] = valueBeforeSOR;
+                       arrayWeights[0] = (Double_t)(timestampAfterEOR - timestampBeforeSOR);
+                       arrayValues[1] = valueAfterEOR;
+                       arrayWeights[1] = 1.;
+                       AliDebug(2,Form("value0 = %f, with weight = %f",arrayValues[0],arrayWeights[0])); 
+                       AliDebug(2,Form("value1 = %f, with weight = %f",arrayValues[1],arrayWeights[1])); 
+                       aDCSArrayMean = TMath::Mean(1,arrayValues,arrayWeights);
+               }
+       }
+
+       AliInfo(Form("mean = %f ",aDCSArrayMean));
        return aDCSArrayMean;
 
 }
@@ -1506,10 +2378,11 @@ AliDCSSensorArray *AliGRPPreprocessor::GetPressureMap(TMap* dcsAliasMap)
        
        TMap *map = fPressure->ExtractDCS(dcsAliasMap);
        if (map) {
+               AliDebug(2,Form("Map has %d entries",map->GetEntries()));
                fPressure->MakeSplineFit(map);
                Double_t fitFraction = fPressure->NumFits()/fPressure->NumSensors(); 
                if (fitFraction > kFitFraction ) {
-                       AliInfo(Form("Pressure values extracted, %d fits performed.", fPressure->NumFits()));
+                       AliInfo(Form("Pressure values extracted, %d fits performed for %d sensors.", fPressure->NumFits(),fPressure->NumSensors()));
                } else { 
                        AliInfo("Too few pressure maps fitted!!!");
                }
@@ -1562,7 +2435,7 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        
        // main logbook
        TString sqlQuery;
-       sqlQuery.Form("SELECT DAQ_time_start, run_type, detectorMask, L3_magnetCurrent, Dipole_magnetCurrent FROM logbook WHERE run = %d", run);
+       sqlQuery.Form("SELECT DAQ_time_start, run_type, detectorMask, L3_magnetCurrent, Dipole_magnetCurrent,beamType FROM logbook WHERE run = %d", run);
        TSQLResult* result = server->Query(sqlQuery);
        if (!result)
                {
@@ -1590,12 +2463,16 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        TString detectorMaskString(row->GetField(2));
        TString l3CurrentString(row->GetField(3));
        TString dipoleCurrentString(row->GetField(4));
+       TString beamTypeString(row->GetField(5));
        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()));
        Char_t l3Polarity = (l3CurrentString.Atof() < 0) ? 1 : 0;
        Char_t dipolePolarity = (dipoleCurrentString.Atof() < 0) ? 1 : 0;
+       if (beamTypeString.CompareTo("Pb-Pb",TString::kIgnoreCase) == 0){
+               beamTypeString="A-A";
+       }
        
        AliGRPObject * grpObj = new AliGRPObject();
        grpObj->SetTimeStart(timeStart); 
@@ -1605,6 +2482,8 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        grpObj->SetDipoleCurrent(dipoleCurrent,(AliGRPObject::Stats)0);
        grpObj->SetL3Polarity(l3Polarity);
        grpObj->SetDipolePolarity(dipolePolarity);
+       grpObj->SetPolarityConventionLHC();  // after the dipole cables swap we comply with LHC convention
+       grpObj->SetBeamType(beamTypeString);
 
        delete row;
        row = 0;
@@ -1701,18 +2580,20 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
                        delete result;
                        return -25;
                }
-       
-       row = result->Next();
-       if (!row)
-               {
-                       Printf("ERROR: Could not receive logbook_stats_GDC data from run %d", run);
-                       delete result;
-                       return -26;
-               }
-       
-       // For the moment take the first GDC in the list
-       gdc = row->GetField(0);
-       
+
+       gdc = "";
+       for (Int_t iGDC = 0; iGDC < result->GetRowCount(); iGDC++) {
+         row = result->Next();
+         if (!row)
+           {
+             Printf("ERROR: Could not receive logbook_stats_GDC data from run %d", run);
+             delete result;
+             return -26;
+           }
+         gdc += row->GetField(0);
+         gdc += " ";
+       }
+
        delete row;
        row = 0;
        
@@ -1763,3 +2644,362 @@ Int_t AliGRPPreprocessor::ReceivePromptRecoParameters(UInt_t run, const char* db
        
        return lastRun;
 }
+//-----------------------------------------------------------------
+Double_t AliGRPPreprocessor::CalculateMean(TObjArray* const array){
+
+       //
+       // Calculating mean over TObjArray from LHC Data
+       //
+
+       TString timeStartString = (TString)GetRunParameter("DAQ_time_start");
+       TString timeEndString = (TString)GetRunParameter("DAQ_time_end");
+       if (timeStartString.IsNull() || timeStartString.IsNull()){
+               if (timeStartString.IsNull()){ 
+                       AliError("DAQ_time_start not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               else if (timeStartString.IsNull()){
+                       AliError("DAQ_time_end not set in logbook! Setting statistical values for current DP to invalid");
+               }
+               return 0;
+       }  
+
+       Int_t timeStart = (Int_t)(timeStartString.Atoi());
+       Int_t timeEnd = (Int_t)(timeEndString.Atoi());
+       timeStart = 1260646960;
+       timeEnd = 1260652740;
+       Double_t* parameters = new Double_t[5];
+       parameters[0] = -1.;
+       parameters[1] = -1.;
+       parameters[2] = -1.;
+       parameters[3] = -1.;
+       parameters[4] = -1.;
+       Int_t iCounts = 0;
+       Int_t iCountsRun = 0;
+       Int_t nCounts = array->GetEntries();
+       printf("ncounts = %d\n",nCounts);
+       Double_t valueBeforeSOR = 0;
+       Double_t valueAfterEOR = 0;
+       Double_t timestampBeforeSOR = -1.;
+       Double_t timestampAfterEOR = -1.;
+       Int_t ientrySOR = -1;
+       Int_t ientryEOR = -1;
+       Double_t* arrayValues = 0x0; 
+       Double_t* arrayWeights = 0x0; 
+       Bool_t truncMeanFlag = kTRUE;  // flag to indicate whether Truncated Mean should be calculated or not
+       Bool_t sdFlag = kTRUE;  // flag to indicate whether SD (wrt Mean/Median) should be calculated or not
+
+       for(Int_t i = 0; i < nCounts; i++) {
+               AliDCSArray *dcs = (AliDCSArray*)array->At(i);
+               if((dcs->GetTimeStamp() >= timeStart) &&(dcs->GetTimeStamp() <= timeEnd)) {
+                       AliDebug(2,Form("%d-th entry = %f at timestamp %f\n",i,(Double_t)(dcs->GetInt(0)),dcs->GetTimeStamp()));
+                       iCounts += 1;
+                       // look for the last value before SOR and the first value before EOR
+                       if ((dcs->GetTimeStamp() >= timeStart) && (dcs->GetTimeStamp() < timeStart)) {
+                               timestampBeforeSOR = dcs->GetTimeStamp();
+                               AliDebug(2,Form("timestamp of last value before SOR = %f, with DAQ_time_start = %d\n",timestampBeforeSOR,timeStart));
+                               valueBeforeSOR = (Double_t)(dcs->GetInt(0));
+                       }
+                       else if ((dcs->GetTimeStamp() <= timeEnd) && (dcs->GetTimeStamp() > timeEnd) && timestampAfterEOR == -1){
+                               timestampAfterEOR = dcs->GetTimeStamp();
+                               valueAfterEOR = (Double_t)(dcs->GetInt(0));
+                               AliDebug(2,Form("timestamp of first value after EOR = %f, with DAQ_time_end = %d\n",timestampAfterEOR,timeEnd));
+                       }
+                       // check if there are DPs between DAQ_time_start and DAQ_time_end
+                       if((dcs->GetTimeStamp() >= timeStart) &&(dcs->GetTimeStamp() <= timeEnd)) {
+                               if (ientrySOR == -1) ientrySOR = i;  // first entry after SOR
+                               if (ientryEOR < i) ientryEOR = i;  // last entry before EOR
+                               AliDebug(2,Form("entry between SOR and EOR\n"));
+                               iCountsRun += 1;
+                       }
+               }
+               else {
+                       printf("DCS values for the parameter outside the queried interval: timestamp = %f\n",dcs->GetTimeStamp());
+               }
+       }
+
+       if (timestampBeforeSOR == -1.){
+               printf("No value found before SOR\n");
+       }
+       if (timestampAfterEOR == -1.){
+               printf("No value found after EOR\n");
+       }
+
+       printf("Number of valid entries (within DCS query interval) = %i, from a total amount of %i entries\n",iCounts,nCounts);
+       printf("Last value before DAQ_time_start (SOR) = %f at timestamp = %f\n",valueBeforeSOR,timestampBeforeSOR);
+       printf("First value after DAQ_time_end (EOR)   = %f at timestamp = %f\n",valueAfterEOR,timestampAfterEOR);
+       printf("Found %d entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)\n",iCountsRun);
+       printf("Index of first entry after DAQ_time_start (SOR) = %d\n ",ientrySOR);
+       printf("Index of first entry before DAQ_time_end (EOR) = %d\n ",ientryEOR);
+
+       Int_t nentriesUsed = 0;
+       if (iCountsRun > 1){
+               printf("Using entries between DAQ_time_start (SOR) and DAQ_time_end (EOR)\n");
+               printf("Calculating (weighted) Mean and Median\n" );
+               arrayValues = new Double_t[iCountsRun]; 
+               arrayWeights = new Double_t[iCountsRun]; 
+               nentriesUsed = iCountsRun;
+               for (Int_t i = ientrySOR; i <= ientryEOR; i++){
+                       AliDCSArray *dcs = (AliDCSArray *)array->At(i);
+                       Double_t timestamp2 = 0;
+                       if (i < ientryEOR){
+                               AliDCSArray *dcs1 = (AliDCSArray *)array->At(i+1);
+                               timestamp2 = dcs1->GetTimeStamp();
+                       }
+                       else {
+                               timestamp2 = (Double_t)timeEnd+1;
+                       }
+                       arrayWeights[i-ientrySOR] = (Double_t)((Double_t)timestamp2 - dcs->GetTimeStamp());
+                       arrayValues[i-ientrySOR] = (Double_t)(dcs->GetInt(0));
+                       printf("Entry %d: value = %f, weight = %f\n",i-ientrySOR,arrayValues[i-ientrySOR],arrayWeights[i-ientrySOR]);
+               }
+               parameters[0] = TMath::Mean(iCountsRun,arrayValues,arrayWeights);
+               parameters[2] = TMath::Median(iCountsRun,arrayValues,arrayWeights);
+       }
+       else if (iCountsRun == 1){
+               AliDCSArray* dcs = (AliDCSArray *)array->At(ientrySOR);
+               nentriesUsed = 2;
+               if (timestampBeforeSOR != -1 && timestampBeforeSOR != (Int_t)dcs->GetTimeStamp()){
+                       printf("Using single entry between DAQ_time_start (SOR) and DAQ_time_end (EOR) and last entry before SOR. Truncated mean won't be calculated.\n");
+                       arrayValues = new Double_t[2];
+                       arrayWeights = new Double_t[2];
+                       arrayValues[0] = valueBeforeSOR;
+                       arrayWeights[0] = (Double_t)(dcs->GetTimeStamp()-(Double_t)timestampBeforeSOR);
+                       arrayValues[1] = (Double_t)(dcs->GetInt(0));
+                       arrayWeights[1] = (Double_t)((Double_t)timeEnd+1-dcs->GetTimeStamp());
+                       printf("value0 = %f, with weight = %f\n",arrayValues[0],arrayWeights[0]); 
+                       printf("value1 = %f, with weight = %f\n",arrayValues[1],arrayWeights[1]); 
+                       parameters[0] = TMath::Mean(2,arrayValues,arrayWeights);
+                       parameters[2] = TMath::Median(2,arrayValues,arrayWeights);
+                       truncMeanFlag = kFALSE;
+               }
+               else{
+                       printf("Cannot calculate mean, truncated mean, median, SD wrt mean, SD wrt median for current DP - only one value collected during the run, but no value before with which to calculate the statistical quantities\n");
+                       parameters[0] = -1;
+                       parameters[1] = -1;
+                       parameters[2] = -1;
+                       parameters[3] = -1;
+                       parameters[4] = -1;
+                       return parameters[0];
+               }
+       }
+       else { // iCountsRun == 0, using only the point immediately before SOR
+               if (timestampBeforeSOR == -1.){
+                       printf("Cannot set mean, truncated mean, median, SD wrt mean, SD wrt median for current DP - no points during the run collected, and point before SOR missing\n");
+                       parameters[0] = -1;
+                       parameters[1] = -1;
+                       parameters[2] = -1;
+                       parameters[3] = -1;
+                       parameters[4] = -1;
+                       return parameters[0];
+               }
+               else {
+                       printf("Using only last entry before SOR. Truncated mean and Standard deviations (wrt mean/median) won't be calculated.\n");
+                       printf("value = %f\n",valueBeforeSOR); 
+                       parameters[0] = valueBeforeSOR;
+                       parameters[2] = valueBeforeSOR;
+                       truncMeanFlag = kFALSE;
+                       sdFlag = kFALSE;
+               }
+       }
+
+       Double_t temp = 0;
+       Double_t temp1 = 0;
+       Double_t sumweights = 0; 
+       Int_t entriesTruncMean = 0;
+       Double_t* arrayValuesTruncMean = new Double_t[nentriesUsed]; 
+       Double_t* arrayWeightsTruncMean = new Double_t[nentriesUsed]; 
+
+       // calculating SD wrt Mean and Median
+       printf("Calculating SD wrt Mean and SD wrt Median\n");
+       if (sdFlag){
+               for (Int_t i =0; i< nentriesUsed; i++){
+                       //printf("Entry %d: value = %f, weight = %f\n",i,arrayValues[i],arrayWeights[i]);
+                       temp += (arrayValues[i]-parameters[2])*(arrayValues[i]-parameters[2]);
+                       temp1 += arrayWeights[i]*(arrayValues[i]-parameters[0])*(arrayValues[i]-parameters[0]);
+                       sumweights += arrayWeights[i];
+               }
+               // setting SD wrt Mean 
+               if (sumweights != 0 ){
+                       parameters[3] = TMath::Sqrt(temp1/sumweights);
+               }
+               else {
+                       printf("Sum of weights to calculate Standard Deviation (wrt mean) <= 0, setting the SD to invalid\n");
+                       parameters[3] = -1;
+               }
+               // setting SD wrt Median
+               if (nentriesUsed != 0){
+                       parameters[4] = TMath::Sqrt(temp/nentriesUsed);
+               }
+               else{
+                       printf("Number of entries used to calculate Standard Deviation (wrt median) <= 0, setting the SD to invalid\n");
+                       parameters[4] = -1;
+               }
+       }
+       else {
+               parameters[3] = -1;
+               parameters[4] = -1;
+       }               
+
+       // calculating truncated mean (this comes afterwards since you need the SD wrt Mean)
+       if (truncMeanFlag){
+               printf("Calculating Truncated Mean\n");
+               for (Int_t i =0; i< nentriesUsed; i++){
+                       //printf("Entry %d: value = %f, weight = %f\n",i,arrayValues[i],arrayWeights[i]);
+                       if ((arrayValues[i]<=parameters[0]+3*parameters[3]) && (arrayValues[i]>=parameters[0]-3*parameters[3])){
+                               arrayValuesTruncMean[entriesTruncMean]=arrayValues[i];
+                               arrayWeightsTruncMean[entriesTruncMean]=arrayWeights[i];
+                               printf("For Truncated Mean: Entry %d: value = %f, weight = %f\n",entriesTruncMean,arrayValuesTruncMean[entriesTruncMean],arrayWeightsTruncMean[entriesTruncMean]);
+                               entriesTruncMean++;                     
+                       }
+                       else{
+                               printf("Discarding entry\n");
+                       }
+               }
+               // setting truncated mean 
+               if (entriesTruncMean >1){
+                       printf("%d entries used for truncated mean\n",entriesTruncMean);
+                       parameters[1] = TMath::Mean(entriesTruncMean,arrayValuesTruncMean,arrayWeightsTruncMean);
+               }
+               else{   
+                       printf("Too few entries (%d) to calculate truncated mean\n",entriesTruncMean);
+                       parameters[1] = -1;
+               }
+       }
+       else{
+                       parameters[1] = -1;
+       }
+       
+       printf("(weighted) mean = %f \n",parameters[0]);
+       printf("(weighted) truncated mean = %f \n",parameters[1]);
+       printf("median = %f \n",parameters[2]);
+       printf("(weighted) standard deviation with (weighted) mean = %f \n",parameters[3]);
+       printf("standard deviation with median = %f \n",parameters[4]);
+       
+       return (parameters[0]);
+}
+//------------------------------------------------------------------------------------------------------
+Float_t AliGRPPreprocessor::ProcessEnergy(TObjArray* const array, Double_t timeStart){
+
+       //
+       // Method to processo LHC Energy information
+       // Only the first value is returned, provided that it is withing DAQ_time_start and DAQ_time_end
+       //
+
+       Int_t nCounts = array->GetEntries();
+       Float_t energy = -1;
+       Double_t timeEnergy = -1;
+       Int_t indexEnergy = -1;
+       Bool_t foundEnergy = kFALSE;
+
+       AliDebug(2,Form("Energy measurements = %d\n",nCounts));
+       if (nCounts ==0){
+               AliWarning("No Energy values found! Beam Energy remaining invalid!");
+       }
+       else{
+               for (Int_t i = 0; i < nCounts; i++){
+                       AliDCSArray *dcs = (AliDCSArray*)array->At(i);
+                       if (dcs){
+                               if (dcs->GetTimeStamp()<=timeStart && dcs->GetTimeStamp()>=timeEnergy){// taking always the very last entry: of two measurements have the same timestamp, the last one is taken
+                                       timeEnergy = dcs->GetTimeStamp();
+                                       indexEnergy = i;
+                                       foundEnergy = kTRUE;
+                               }
+                               else{
+                                       break;
+                               }
+                       }
+               }
+               if (!foundEnergy){
+                       AliInfo("No value for the Energy found before start of run, the Energy will remain invalid");
+               }
+               else {
+                       AliDCSArray* dcs = (AliDCSArray*)array->At(indexEnergy);
+                       energy = (Float_t)(TMath::Nint(((Double_t)(dcs->GetInt(0)))*120/1000)); // sqrt(s)/2 energy in GeV
+                       AliInfo(Form("Energy value found = %d (at %f), converting --> sqrt(s)/2 = %f (GeV)", dcs->GetInt(0),dcs->GetTimeStamp(),energy));
+               }
+       }
+
+       return energy;
+}
+//------------------------------------------------------------------------------------------------------
+AliLHCClockPhase* AliGRPPreprocessor::ProcessLHCClockPhase(TObjArray *beam1phase,TObjArray *beam2phase, Double_t timeEnd)
+{
+  //
+  // Method to process LHC-Clock Phase data
+  // Only the values between DAQ_time_start and DAQ_time_end are kept
+  //
+  AliLHCClockPhase *phaseObj = new AliLHCClockPhase;
+
+  Bool_t foundBeam1Phase = kFALSE, foundBeam2Phase = kFALSE;
+  const Float_t threshold = 0.050; // we store the measurement only in case they differ with more 50ps from the previous one 
+
+  TString timeCreatedStr = GetRunParameter("time_created");
+  Double_t timeCreated = timeCreatedStr.Atof();
+
+  Int_t nCounts = beam1phase->GetEntries();
+  AliDebug(2,Form("Beam1 phase measurements = %d\n",nCounts));
+  if (nCounts ==0){
+    AliWarning("No beam1 LHC clock phase values found!");
+    delete phaseObj;
+    return NULL;
+  }
+  else{
+    Double_t prevPhase = 0;
+    for (Int_t i = 0; i < nCounts; i++){
+      AliDCSArray *dcs = (AliDCSArray*)beam1phase->At(i);
+      if (dcs){
+             //if (dcs->GetTimeStamp()>=timeStart && dcs->GetTimeStamp()<=timeEnd) {
+             if (dcs->GetTimeStamp()>=timeCreated && dcs->GetTimeStamp()<=timeEnd) {
+         if ((i == 0) || (i == (nCounts-1)) ||
+             !foundBeam1Phase ||
+             (TMath::Abs(dcs->GetDouble(0)-prevPhase) > threshold)) {
+           prevPhase = dcs->GetDouble(0);
+           foundBeam1Phase = kTRUE;
+           AliInfo(Form("B1 Clk Phase = %f at TS = %f",
+                        (Float_t)dcs->GetDouble(0),dcs->GetTimeStamp()));  
+           phaseObj->AddPhaseB1DP((UInt_t)dcs->GetTimeStamp(),(Float_t)dcs->GetDouble(0));
+         }
+       }
+      }
+    }
+    if (!foundBeam1Phase){
+      AliError("No beam1 LHC clock phase values found within the run!");
+      delete phaseObj;
+      return NULL;
+    }
+  }
+
+  nCounts = beam2phase->GetEntries();
+  AliDebug(2,Form("Beam2 phase measurements = %d\n",nCounts));
+  if (nCounts ==0){
+    AliWarning("No beam2 LHC clock phase values found!");
+    delete phaseObj;
+    return NULL;
+  }
+  else{
+    Double_t prevPhase = 0;
+    for (Int_t i = 0; i < nCounts; i++){
+      AliDCSArray *dcs = (AliDCSArray*)beam2phase->At(i);
+      if (dcs){
+       if (dcs->GetTimeStamp()>=timeCreated && dcs->GetTimeStamp()<=timeEnd) {
+         if ((i == 0) || (i == (nCounts-1)) ||
+             !foundBeam2Phase ||
+             (TMath::Abs(dcs->GetDouble(0)-prevPhase) > threshold)) {
+           prevPhase = dcs->GetDouble(0);
+           foundBeam2Phase = kTRUE;
+           AliInfo(Form("B2 Clk Phase = %f at TS = %f",
+                        (Float_t)dcs->GetDouble(0),dcs->GetTimeStamp()));  
+           phaseObj->AddPhaseB2DP((UInt_t)dcs->GetTimeStamp(),(Float_t)dcs->GetDouble(0));
+         }
+       }
+      }
+    }
+    if (!foundBeam2Phase){
+      AliError("No beam2 LHC clock phase values found within the run!");
+      delete phaseObj;
+      return NULL;
+    }
+  }
+
+  return phaseObj;
+}