]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ZDC/AliZDCPreprocessor.cxx
initialisation bug fixed
[u/mrichter/AliRoot.git] / ZDC / AliZDCPreprocessor.cxx
index 2da47579fdff47027518544ee5cc7e3fca5efa5c..fa8fea7f2a8a9025cd5a318081a55ec0669e2132 100644 (file)
 #include "AliAlignObjParams.h"
 #include "AliLog.h"
 #include "AliZDCDataDCS.h"
+#include "AliZDCChMap.h"
 #include "AliZDCPedestals.h"
-#include "AliZDCCalib.h"
-#include "AliZDCRecParam.h"
+#include "AliZDCLaserCalib.h"
+#include "AliZDCEnCalib.h"
+#include "AliZDCTowerCalib.h"
 
 /////////////////////////////////////////////////////////////////////
 //                                                                //
-// Class implementing ZDC pre-processor.                          //
-// It takes data from DCS and passes it to the class AliZDCDataDCS //
-// The class is then written to the CDB.                          //
+// Class implementing Shuttle ZDC pre-processor.                  //
+// It takes data from DCS and DAQ and writes calibration objects   //
+// in the OCDB and reference values/histos in the ReferenceData.   //
 //                                                                //
 /////////////////////////////////////////////////////////////////////
 
+// ******************************************************************
+//    RETURN CODES:
+// return=0 : everything OK
+// return=1 : no DCS input data Map
+// return=2 : error when storing in RefData DCS processed data
+// return=3 : error in storing alignment object in OCDB
+// return=4 : error retrieving/reading data file from DAQ FXS
+// return=5 : error when storing ADC ch. mapping in OCDB
+// return=6 : error when storing energy calibration coefficients
+// return=7 : error when storing tower inter-calibration coefficients
+// return=8 : error when storing pedestal parameters in OCDB
+// return=9 : error when storing pedestal histos in RefData
+// return=10: error when storing laser coefficients in OCDB
+// return=11: error when storing laser histos in RefData
+// ******************************************************************
+
 ClassImp(AliZDCPreprocessor)
 
 //______________________________________________________________________________________________
@@ -34,8 +52,20 @@ AliZDCPreprocessor::AliZDCPreprocessor(AliShuttleInterface* shuttle) :
   fData(0)
 {
   // constructor
+  // May 2009 - run types updated according to
+  // http://alice-ecs.web.cern.ch/alice-ecs/runtypes_3.36.html
+  AddRunType("STANDALONE_PEDESTAL");
+  AddRunType("STANDALONE_LASER");
+  AddRunType("STANDALONE_COSMIC");
+  AddRunType("CALIBRATION_EMD");
+  AddRunType("CALIBRATION_MB");
+  AddRunType("CALIBRATION_CENTRAL");
+  AddRunType("CALIBRATION_SEMICENTRAL");
+  AddRunType("CALIBRATION_BC");
+  AddRunType("PHYSICS");
 }
 
+
 //______________________________________________________________________________________________
 AliZDCPreprocessor::~AliZDCPreprocessor()
 {
@@ -51,35 +81,56 @@ void AliZDCPreprocessor::Initialize(Int_t run, UInt_t startTime,
 
   AliPreprocessor::Initialize(run, startTime, endTime);
 
-       Log(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", run,
+  AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s \n\tStartTime DCS Query %s \n\tEndTime DCS Query %s", run,
                TTimeStamp(startTime).AsString(),
-               TTimeStamp(endTime).AsString()));
+               TTimeStamp(endTime).AsString(), ((TTimeStamp)GetStartTimeDCSQuery()).AsString(), ((TTimeStamp)GetEndTimeDCSQuery()).AsString()));
+
+  fRun = run;
+  fStartTime = startTime;
+  fEndTime = endTime;
+
+  fData = new AliZDCDataDCS(fRun, fStartTime, fEndTime, GetStartTimeDCSQuery(), GetEndTimeDCSQuery());
+}
 
-       fRun = run;
-        fStartTime = startTime;
-        fEndTime = endTime;
+//_____________________________________________________________________________
+Bool_t AliZDCPreprocessor::ProcessDCS(){
+
+  // tells whether DCS should be processed or not
+
+  TString runType = GetRunType();
+  Log(Form("RunType %s",runType.Data()));
+
+  if (runType=="STANDALONE_COSMIC" || runType=="STANDALONE_PEDESTAL"){
+    return kFALSE;
+  }
 
-       fData = new AliZDCDataDCS(fRun, fStartTime, fEndTime);
+  return kTRUE;
 }
 
 //______________________________________________________________________________________________
-UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
+UInt_t AliZDCPreprocessor::ProcessDCSData(TMap* dcsAliasMap)
 {
-  // *************** From DCS ******************
+  
   // Fills data into a AliZDCDataDCS object
   if(!dcsAliasMap) return 1;
-
+  Log(Form("Processing data from DCS"));
   // The processing of the DCS input data is forwarded to AliZDCDataDCS
   Float_t dcsValues[28]; // DCSAliases=28
-  fData->ProcessData(*dcsAliasMap, dcsValues);
+  fData->SetCalibData(dcsValues);
+  Bool_t resDCSProcess = fData->ProcessData(*dcsAliasMap);
+  //dcsAliasMap->Print(""); 
+  if(resDCSProcess==kFALSE) Log(" Problems in processing DCS DP");
+  
   // Store DCS data for reference
   AliCDBMetaData metadata;
   metadata.SetResponsible("Chiara Oppedisano");
   metadata.SetComment("DCS data for ZDC");
   Bool_t resDCSRef = kTRUE;
   resDCSRef = StoreReferenceData("DCS","Data",fData,&metadata);
-  //dcsAliasMap->Print("");
-  //
+  
+  if(resDCSRef==kFALSE) return 2;
+
   // --- Writing ZDC table positions into alignment object
   TClonesArray *array = new TClonesArray("AliAlignObjParams",10);
   TClonesArray &alobj = *array;
@@ -90,10 +141,12 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   Double_t dyZP1 = (Double_t) (dcsValues[1]/10.);
   Double_t dyZN2 = (Double_t) (dcsValues[2]/10.);
   Double_t dyZP2 = (Double_t) (dcsValues[3]/10.);
-  const char *n1ZDC="ZDC/NeutronZDC1";
-  const char *p1ZDC="ZDC/ProtonZDC1";
-  const char *n2ZDC="ZDC/NeutronZDC2";
-  const char *p2ZDC="ZDC/ProtonZDC2";
+  //
+  const char *n1ZDC="ZDC/NeutronZDC_C";  
+  const char *p1ZDC="ZDC/ProtonZDC_C";
+  const char *n2ZDC="ZDC/NeutronZDC_A";
+  const char *p2ZDC="ZDC/ProtonZDC_A";
+  //
   UShort_t iIndex=0;
   AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
@@ -102,238 +155,561 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   new(alobj[1]) AliAlignObjParams(p1ZDC, volid, dx, dyZP1, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[2]) AliAlignObjParams(n2ZDC, volid, dx, dyZN2, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[3]) AliAlignObjParams(p2ZDC, volid, dx, dyZP2, dz, dpsi, dtheta, dphi, kTRUE);
   // save in CDB storage
-  AliCDBMetaData md;
-  md.SetResponsible("Chiara Oppedisano");
-  md.SetComment("Alignment object for ZDC");
-  Bool_t resultAl = kTRUE;
-  resultAl = Store("Align","Data", array, &md, 0, 0);
+  AliCDBMetaData mdDCS;
+  mdDCS.SetResponsible("Chiara Oppedisano");
+  mdDCS.SetComment("Alignment object for ZDC");
+  Bool_t resultAl = Store("Align","Data", array, &mdDCS, 0, 0);
+  if(resultAl==kFALSE)  return 3;
   
-// *************** From DAQ ******************
-Bool_t resPedCal = kTRUE, resECal = kTRUE, resRecPar = kTRUE;
-// *****************************************************
-// [a] PEDESTALS -> Pedestal subtraction
-// *****************************************************
-TString runType = GetRunType();
-printf("\n\t AliZDCPreprocessor -> runType detected %s\n\n",runType.Data());
-if(runType == "PEDESTAL_RUN"){
-  TList* daqSources = GetFileSources(kDAQ, "PEDESTALS");
-  if(!daqSources){
-    Log(Form("No source for PEDESTALS run %d !", fRun));
-    return 1;
+  return 0;
+}
+
+//______________________________________________________________________________________________
+UInt_t AliZDCPreprocessor::ProcessChMap(TString runType)
+{ 
+  const int kNch = 48;
+  
+  // Reading the file for mapping from FXS
+  TList* daqSource = GetFileSources(kDAQ, runType.Data());
+  if(!daqSource){
+    AliError(Form("No sources run %d for run type %s!", fRun, runType.Data()));
+    return 4;
   }
-  Log("\t List of sources for PEDESTALS");
-  daqSources->Print();
+  Log("\t List of DAQ sources for mapping "); daqSource->Print();
   //
-  TIter iter(daqSources);
+  TIter iter(daqSource);
   TObjString* source = 0;
-  Int_t i=0;
+  Int_t isou = 0;
+  Int_t readMap[kNch][6]; 
+  //
   while((source = dynamic_cast<TObjString*> (iter.Next()))){
-       Log(Form("\n\t Getting file #%d\n",++i));
-       TString stringPedFileName = GetFile(kDAQ, "PEDESTALS", source->GetName());
-       if(stringPedFileName.Length() <= 0){
-          Log(Form("No PEDESTAL file from source %s!", source->GetName()));
-         return 1;
-       }
-       // --- Initializing pedestal calibration object
-       AliZDCPedestals *pedCalib = new AliZDCPedestals("ZDC");
-       // --- Reading file with pedestal calibration data
-       const char* pedFileName = stringPedFileName.Data();
-       // no. ADCch = (22 signal ch. + 2 reference PMs) * 2 gain chain = 48
-       const Int_t knZDCch = 48;
-       if(pedFileName){
-         FILE *file;
-         if((file = fopen(pedFileName,"r")) == NULL){
-           printf("Cannot open file %s \n",pedFileName);
-          return 1;
-         }
-         Log(Form("File %s connected to process pedestal data", pedFileName));
-         Float_t pedVal[(3*knZDCch)][2];
-         for(Int_t i=0; i<(3*knZDCch); i++){
-            for(Int_t j=0; j<2; j++){
-               fscanf(file,"%f",&pedVal[i][j]);
-              //if(j==1) printf("pedVal[%d] -> %f, %f \n",i,pedVal[i][0],pedVal[i][1]);
-            }
-            if(i<knZDCch){
-              pedCalib->SetMeanPed(i,pedVal[i][0]);
-              pedCalib->SetMeanPedWidth(i,pedVal[i][1]);
-            }
-            else if(i>=knZDCch && i<(2*knZDCch)){
-              pedCalib->SetOOTPed(i-knZDCch,pedVal[i][0]);
-              pedCalib->SetOOTPedWidth(i-knZDCch,pedVal[i][1]);
-            }
-            else if(i>=(2*knZDCch) && i<(3*knZDCch)){
-              pedCalib->SetPedCorrCoeff(i-(2*knZDCch),pedVal[i][0],pedVal[i][1]);
-            }
-         }
-       }
-       else{
-          Log(Form("File %s not found", pedFileName));
-          return 1;
+     Log(Form("\n\t Getting file #%d\n",++isou));
+     TString fileName = "ZDCChMapping.dat";
+
+     if(fileName.Length() <= 0){
+       Log(Form("No file from source %s!", source->GetName()));
+       return 4;
+     }
+     // --- Reading file with calibration data
+     //const char* fname = fileName.Data();
+     if(fileName){
+       FILE *file;
+       if((file = fopen(fileName,"r")) == NULL){
+        printf("Cannot open file %s \n",fileName.Data());
+         return 4;
        }
+       Log(Form("File %s connected to process data for ADC mapping", fileName.Data()));
        //
-      //pedCalib->Print("");
-      // 
-      AliCDBMetaData metaData;
-      metaData.SetBeamPeriod(0);
-      metaData.SetResponsible("Chiara");
-      metaData.SetComment("Filling AliZDCPedestals object");  
-      //
-      resPedCal = Store("Calib","Pedestals",pedCalib, &metaData, 0, 1);
+       for(Int_t j=0; j<kNch; j++){      
+           for(Int_t k=0; k<6; k++){
+             int read = fscanf(file,"%d",&readMap[j][k]);
+            if(read == 0) AliDebug(3," Failing in reading data from mapping file");
+           }
+       }
+       fclose(file);
+     }
+     else{
+       Log(Form("File %s not found", fileName.Data()));
+       return 4;
+     }
   }
-  delete daqSources; daqSources = 0;
+  delete daqSource; daqSource=0;
+  
+  // Store the currently read map ONLY IF it is different
+  // from the entry in the OCDB
+  Bool_t updateOCDB = kFALSE;
+  
+  AliCDBEntry *cdbEntry = GetFromOCDB("Calib","ChMap");
+  if(!cdbEntry){
+    Log(" No existing CDB entry for ADC mapping");
+    updateOCDB = kTRUE;
+  }
+  else{
+    AliZDCChMap *chMap = (AliZDCChMap*) cdbEntry->GetObject();
+    for(Int_t i=0; i<kNch; i++){
+      if(  (readMap[i][1] == chMap->GetADCModule(i)) 
+        && (readMap[i][2] == chMap->GetADCChannel(i)) 
+       && (readMap[i][4] == chMap->GetDetector(i)) 
+       && (readMap[i][5] == chMap->GetSector(i))){
+        updateOCDB = kFALSE;
+      }
+      else updateOCDB = kTRUE;
+    }
+  }
+  //
+  Bool_t resChMapStore = kTRUE;
+  if(updateOCDB==kTRUE){
+    Log(" A new entry ZDC/Calib/ChMap will be created");
+    //
+    // --- Initializing mapping calibration object
+    AliZDCChMap *mapCalib = new AliZDCChMap("ZDC");
+    // Writing channel map in the OCDB
+    for(Int_t k=0; k<kNch; k++){
+      mapCalib->SetADCModule(k,readMap[k][1]);
+      mapCalib->SetADCChannel(k,readMap[k][2]);
+      mapCalib->SetDetector(k,readMap[k][4]);
+      mapCalib->SetSector(k,readMap[k][5]);
+    }
+    //mapCalib->Print("");
+    // 
+    AliCDBMetaData metaData;
+    metaData.SetBeamPeriod(0);
+    metaData.SetResponsible("Chiara Oppedisano");
+    metaData.SetComment("Filling AliZDCChMap object");  
+    //
+    resChMapStore = Store("Calib","ChMap",mapCalib, &metaData, 0, 1);
+  }
+  else{
+    Log(" ZDC/Calib/ChMap entry in OCDB is valid and won't be updated");
+    resChMapStore = kTRUE;
+  }
+  
+  if(resChMapStore==kFALSE) return 5;
+  
+  return 0;
+
 }
-// *****************************************************
-// [b] EMD EVENTS -> Energy calibration and equalization
-// *****************************************************
-else if(runType == "PULSER_RUN"){
-  TList* daqSources = GetFileSources(kDAQ, "EMDCALIB");
+
+//______________________________________________________________________________________________
+UInt_t AliZDCPreprocessor::ProcessppData()
+{
+   Bool_t resEnCal=kTRUE, resTowCal=kTRUE;
+  
+   // *********** Energy calibration
+   // --- Cheking if there is already the entry in the OCDB
+   AliCDBEntry *cdbEnEntry = GetFromOCDB("Calib", "EnergyCalib");
+   if(!cdbEnEntry){   
+     Log(Form(" ZDC/Calib/EnergyCalib entry will be created"));
+     // --- Initializing calibration object
+     AliCDBMetaData metaData;
+     metaData.SetBeamPeriod(0);
+     metaData.SetResponsible("Chiara Oppedisano");
+     //
+     AliZDCEnCalib *eCalib = new AliZDCEnCalib("ZDC");
+     for(Int_t j=0; j<6; j++) eCalib->SetEnCalib(j,1.);
+     metaData.SetComment("AliZDCEnCalib object");  
+     //eCalib->Print("");
+     resEnCal = Store("Calib", "EnergyCalib", eCalib, &metaData, 0, 1);
+   }
+   else{ 
+     // if entry exists it is still valid (=1 for all runs!)
+     Log(Form(" Valid ZDC/Calib/EnergyCalib object already existing in OCDB!!!"));
+     resEnCal = kTRUE;
+   }
+   
+   if(resEnCal==kFALSE) return 6;
+
+   //
+   // *********** Tower inter-calibration
+   // --- Cheking if there is already the entry in the OCDB
+   AliCDBEntry *cdbTowEntry = GetFromOCDB("Calib", "TowerCalib");
+   if(!cdbTowEntry){   
+     AliZDCTowerCalib *towCalib = new AliZDCTowerCalib("ZDC");
+     for(Int_t j=0; j<5; j++){  
+        towCalib->SetZN1EqualCoeff(j, 1.);
+        towCalib->SetZP1EqualCoeff(j, 1.);
+        towCalib->SetZN2EqualCoeff(j, 1.);
+        towCalib->SetZP2EqualCoeff(j, 1.);  
+     }
+     //towCalib->Print("");
+     // 
+     AliCDBMetaData metaData;
+     metaData.SetBeamPeriod(0);
+     metaData.SetResponsible("Chiara Oppedisano");
+     metaData.SetComment("AliZDCTowerCalib object");  
+     //
+     resTowCal = Store("Calib", "TowerCalib", towCalib, &metaData, 0, 1);
+   }
+   else{ 
+     // if entry exists it is still valid (=1 for all runs!)
+     Log(Form(" Valid ZDC/Calib/TowerCalib object already existing in OCDB!!!"));
+     resTowCal = kTRUE;
+   }
+   
+   if(resTowCal==kFALSE) return 7;
+   
+   return 0;
+}
+
+//______________________________________________________________________________________________
+UInt_t AliZDCPreprocessor::ProcessCalibData()
+{
+  TList* daqSources = GetFileSources(kDAQ, "ENERGYCALIB");
   if(!daqSources){
-    AliError(Form("No sources for PULSER_RUN run %d !", fRun));
-    return 1;
+    AliError(Form("No sources for CALIBRATION_EMD run %d !", fRun));
+    return 4;
   }
-  Log("\t List of sources for PULSER_RUN");
+  Log("\t List of DAQ sources for CALIBRATION_EMD run");
   daqSources->Print();
   //
   TIter iter2(daqSources);
   TObjString* source = 0;
-  Int_t j=0;
+  Int_t i=0;
+  Bool_t resEnCal=kTRUE;
   while((source = dynamic_cast<TObjString*> (iter2.Next()))){
-       Log(Form("\n\t Getting file #%d\n",++j));
-       TString stringEMDFileName = GetFile(kDAQ, "EMDCALIB", source->GetName());
-       if(stringEMDFileName.Length() <= 0){
-         Log(Form("No EMDCALIB file from source %s!", source->GetName()));
-        return 1;
-       }
-       // --- Initializing pedestal calibration object
-       AliZDCCalib *eCalib = new AliZDCCalib("ZDC");
-       // --- Reading file with pedestal calibration data
-       const char* emdFileName = stringEMDFileName.Data();
-       if(emdFileName){
-        FILE *file;
-        if((file = fopen(emdFileName,"r")) == NULL){
-          printf("Cannot open file %s \n",emdFileName);
-          return 1;
+    Log(Form("\n\t Getting file #%d\n",++i));
+    TString stringEMDFileName = GetFile(kDAQ, "ENERGYCALIB", source->GetName());
+    if(stringEMDFileName.Length() <= 0){
+      Log(Form("No file from source %s!", source->GetName()));
+      return 4;
+    }
+    // --- Initializing energy calibration object
+    AliZDCEnCalib *eCalib = new AliZDCEnCalib("ZDC");
+    // --- Reading file with pedestal calibration data
+    const char* emdFileName = stringEMDFileName.Data();
+    if(emdFileName){
+      FILE *file;
+      if((file = fopen(emdFileName,"r")) == NULL){
+       printf("Cannot open file %s \n",emdFileName);
+       return 4;
+      }
+      Log(Form("File %s connected to process data from EM dissociation events", emdFileName));
+      //
+      Float_t fitValEMD[6];
+      for(Int_t j=0; j<6; j++){        
+       if(j<6){
+         int iread = fscanf(file,"%f",&fitValEMD[j]);
+         if(iread==0) AliDebug(3," Failing reading daa from EMD calibration data file");
+         eCalib->SetEnCalib(j,fitValEMD[j]);
+       }
+      }
+      //
+      fclose(file);
+    }
+    else{
+      Log(Form("File %s not found", emdFileName));
+      return 4;
+    }
+    //eCalib->Print("");
+    // 
+    AliCDBMetaData metaData;
+    metaData.SetBeamPeriod(0);
+    metaData.SetResponsible("Chiara Oppedisano");
+    metaData.SetComment("Filling AliZDCEnCalib object");  
+    //
+    resEnCal = Store("Calib","EnergyCalib",eCalib, &metaData, 0, 1);
+    if(resEnCal==kFALSE) return 6;
+  }
+  delete daqSources; daqSources = 0;
+   
+
+  TList* daqSourcesH = GetFileSources(kDAQ, "TOWERCALIB");
+  if(!daqSourcesH){
+    AliError(Form("No sources for CALIBRATION_EMD run %d !", fRun));
+    return 4;
+  }
+  Log("\t List of DAQ sources for CALIBRATION_EMD run");
+  daqSourcesH->Print();
+  //
+  TIter iter2H(daqSourcesH);
+  TObjString* sourceH = 0;
+  Int_t iH=0;
+  Bool_t resTowCal=kTRUE;
+  while((sourceH = dynamic_cast<TObjString*> (iter2H.Next()))){
+    Log(Form("\n\t Getting file #%d\n",++iH));
+    TString stringEMDFileName = GetFile(kDAQ, "TOWERCALIB", sourceH->GetName());
+    if(stringEMDFileName.Length() <= 0){
+      Log(Form("No file from source %s!", sourceH->GetName()));
+      return 4;
+    }
+    // --- Initializing energy calibration object
+    AliZDCTowerCalib *towCalib = new AliZDCTowerCalib("ZDC");
+    // --- Reading file with pedestal calibration data
+    const char* emdFileName = stringEMDFileName.Data();
+    if(emdFileName){
+      FILE *file;
+      if((file = fopen(emdFileName,"r")) == NULL){
+       printf("Cannot open file %s \n",emdFileName);
+       return 4;
+      }
+      Log(Form("File %s connected to process data from EM dissociation events", emdFileName));
+      //
+      Float_t equalCoeff[4][5];
+      for(Int_t j=0; j<4; j++){        
+        for(Int_t k=0; k<5; k++){
+           int leggi = fscanf(file,"%f",&equalCoeff[j][k]);
+           if(leggi==0) AliDebug(3," Failing reading data from EMD calibration file");
+           if(j==0)      towCalib->SetZN1EqualCoeff(k, equalCoeff[j][k]);
+           else if(j==1) towCalib->SetZP1EqualCoeff(k, equalCoeff[j][k]);
+           else if(j==2) towCalib->SetZN2EqualCoeff(k, equalCoeff[j][k]);
+           else if(j==3) towCalib->SetZP2EqualCoeff(k, equalCoeff[j][k]);  
         }
-        Log(Form("File %s connected to process data from EM dissociation events", emdFileName));
-        //
-        Float_t fitValEMD[6]; Float_t equalCoeff[5][4];
-        Float_t calibVal[4];
-        for(Int_t j=0; j<10; j++){         
-          if(j<6){
-            fscanf(file,"%f",&fitValEMD[j]);
-             if(j<4){
-              calibVal[j] = fitValEMD[j]/2.76;
-              eCalib->SetEnCalib(j,calibVal[j]);
-            }
-            else eCalib->SetEnCalib(j,fitValEMD[j]);
-          }
-          else{
-            for(Int_t k=0; k<5; k++){
-               fscanf(file,"%f",&equalCoeff[j][k]);
-               if(j==6) eCalib->SetZN1EqualCoeff(k, equalCoeff[j][k]);
-               else if(j==7) eCalib->SetZP1EqualCoeff(k, equalCoeff[j][k]);
-               else if(j==8) eCalib->SetZN2EqualCoeff(k, equalCoeff[j][k]);
-               else if(j==9) eCalib->SetZP2EqualCoeff(k, equalCoeff[j][k]);  
-             }
-          }
-         }
-       }
-       else{
-         Log(Form("File %s not found", emdFileName));
-         return 1;
-       }
-       //calibdata->Print("");
-      // 
-      AliCDBMetaData metaData;
-      metaData.SetBeamPeriod(0);
-      metaData.SetResponsible("Chiara");
-      metaData.SetComment("Filling AliZDCCalib object");  
+      }
       //
-      resECal = Store("Calib","Calib",eCalib, &metaData, 0, 1);
+      fclose(file);
+    }
+    else{
+      Log(Form("File %s not found", emdFileName));
+      return 4;
+    }
+    //towCalib->Print("");
+    // 
+    AliCDBMetaData metaData;
+    metaData.SetBeamPeriod(0);
+    metaData.SetResponsible("Chiara Oppedisano");
+    metaData.SetComment("Filling AliZDCTowerCalib object");  
+    //
+    resTowCal = Store("Calib","TowerCalib",towCalib, &metaData, 0, 1);
+    if(resTowCal==kFALSE) return 7;
   }
+  delete daqSources; daqSources = 0;
+  
+  return 0;
 }
-// ********************************************************
-// [c] PHYSICS RUNS -> Parameters needed for reconstruction
-// ********************************************************
-else if(runType == "PHYSICS"){
-  TList* daqSources = GetFileSources(kDAQ, "PHYSICS");
+
+//______________________________________________________________________________________________
+UInt_t AliZDCPreprocessor::ProcessPedestalData()
+{
+  TList* daqSources = GetFileSources(kDAQ, "PEDESTALDATA");
   if(!daqSources){
-    AliError(Form("No sources for PHYSICS run %d !", fRun));
+    Log(Form("No source for STANDALONE_PEDESTAL run %d !", fRun));
+    return 4;
+  }
+  Log("\t List of DAQ sources for STANDALONE_PEDESTAL run");
+  daqSources->Print();
+  //
+  TIter iter(daqSources);
+  TObjString* source = 0;
+  Int_t i=0;
+  Bool_t resPedCal=kTRUE;
+  while((source = dynamic_cast<TObjString*> (iter.Next()))){
+     Log(Form("\n\t Getting file #%d\n",++i));
+     TString stringPedFileName = GetFile(kDAQ, "PEDESTALDATA", source->GetName());
+     if(stringPedFileName.Length() <= 0){
+       Log(Form("No PEDESTAL file from source %s!", source->GetName()));
+        return 4;
+     }
+     // calibration data
+     // --- Initializing pedestal calibration object
+     AliZDCPedestals *pedCalib = new AliZDCPedestals("ZDC");
+     // --- Reading file with pedestal calibration data
+     const char* pedFileName = stringPedFileName.Data();
+     // no. ADCch = (22 signal ch. + 2 reference PMs) * 2 gain chain = 48
+     const Int_t knZDCch = 48;
+
+     FILE *file;
+     if((file = fopen(pedFileName,"r")) == NULL){
+       printf("Cannot open file %s \n",pedFileName);
+       return 4;
+     }
+     Log(Form("File %s connected to process pedestal data", pedFileName));
+     Float_t pedVal[(2*knZDCch)][2];
+     for(Int_t k=0; k<(2*knZDCch); k++){
+       for(Int_t j=0; j<2; j++){
+          int aleggi = fscanf(file,"%f",&pedVal[k][j]);
+          if(aleggi==0) AliDebug(3," Failing reading data from pedestal file");
+          //if(j==1) printf("pedVal[%d] -> %f, %f \n",k,pedVal[k][0],pedVal[k][1]);
+       }
+       if(k<knZDCch){
+         pedCalib->SetMeanPed(k,pedVal[k][0]);
+         pedCalib->SetMeanPedWidth(k,pedVal[k][1]);
+       }
+       else if(k>=knZDCch && k<(2*knZDCch)){
+         pedCalib->SetOOTPed(k-knZDCch,pedVal[k][0]);
+         pedCalib->SetOOTPedWidth(k-knZDCch,pedVal[k][1]);
+       }
+       else if(k>=(2*knZDCch) && k<(3*knZDCch)){
+         pedCalib->SetPedCorrCoeff(k-(2*knZDCch),pedVal[k][0],pedVal[k][1]);
+       }
+     }
+     fclose(file);
+     //pedCalib->Print("");
+     // 
+     AliCDBMetaData metaData;
+     metaData.SetBeamPeriod(0);
+     metaData.SetResponsible("Chiara Oppedisano");
+     metaData.SetComment("Filling AliZDCPedestals object");  
+     //
+     resPedCal = Store("Calib","Pedestals",pedCalib, &metaData, 0, 1);
+     if(resPedCal==kFALSE) return 8;
+  }
+  delete daqSources; daqSources = 0;
+
+  //
+  Bool_t resPedHist=kTRUE;
+  TList* daqSourceH = GetFileSources(kDAQ, "PEDHISTOS");
+  if(!daqSourceH){
+    Log(Form("No source for STANDALONE_PEDESTAL run %d !", fRun));
+    return 4;
+  }
+  Log("\t List of DAQ sources for STANDALONE_PEDESTAL run");
+  daqSourceH->Print();
+  //
+  TIter iterH(daqSourceH);
+  TObjString* sourceH = 0;
+  Int_t iH=0;
+  while((sourceH = dynamic_cast<TObjString*> (iterH.Next()))){
+     Log(Form("\n\t Getting file #%d\n",++iH));
+     TString stringPedFileName = GetFile(kDAQ, "PEDHISTOS", sourceH->GetName());
+     if(stringPedFileName.Length() <= 0){
+       Log(Form("No PEDESTAL file from source %s!", sourceH->GetName()));
+        return 4;
+     }
+     TFile *histoFile = TFile::Open(stringPedFileName.Data());
+     //
+     AliCDBMetaData metadata1;
+     metadata1.SetResponsible("Chiara Oppedisano");
+     metadata1.SetComment("Pedestal histos");
+     resPedHist = StoreReferenceData("Histos","Pedestal", histoFile, &metadata1);
+     if(resPedHist==kFALSE) return 9;
+  }
+  delete daqSourceH; daqSourceH = 0;
+  
+  
+  return 0;
+}
+
+//______________________________________________________________________________________________
+UInt_t AliZDCPreprocessor::ProcessLaserData()
+{
+  TList* daqSources = GetFileSources(kDAQ, "LASERDATA");
+  if(!daqSources){
+    AliError(Form("No sources for STANDALONE_LASER run %d !", fRun));
     return 1;
   }
-  Log("\t List of sources for PHYSICS");
+  Log("\t List of DAQ sources for STANDALONE_LASER run");
   daqSources->Print();
   //
   TIter iter2(daqSources);
   TObjString* source = 0;
-  Int_t j=0;
+  Int_t i=0;
+  Bool_t resLaserCal=kTRUE;
   while((source = dynamic_cast<TObjString*> (iter2.Next()))){
-       Log(Form("\n\t Getting file #%d\n",++j));
-       TString stringPHYSFileName = GetFile(kDAQ, "PHYSICS", source->GetName());
-       if(stringPHYSFileName.Length() <= 0){
-         Log(Form("No PHYSICS file from source %s!", source->GetName()));
-        return 1;
-       }
-       // --- Initializing pedestal calibration object
-       AliZDCRecParam *recCalib = new AliZDCRecParam("ZDC");
-       // --- Reading file with pedestal calibration data
-       const char* physFileName = stringPHYSFileName.Data();
-       if(physFileName){
-        FILE *file;
-        if((file = fopen(physFileName,"r")) == NULL){
-          printf("Cannot open file %s \n",physFileName);
-          return 1;
-        }
-        Log(Form("File %s connected to process data from PHYSICS runs", physFileName));
-        //
-        Float_t physRecParam[10]; 
-        for(Int_t j=0; j<10; j++) fscanf(file,"%f",&physRecParam[j]);
-        recCalib->SetZEMEndValue(physRecParam[0]);
-        recCalib->SetZEMCutFraction(physRecParam[1]);
-        recCalib->SetDZEMSup(physRecParam[2]);
-        recCalib->SetDZEMInf(physRecParam[3]);
-        recCalib->SetEZN1MaxValue(physRecParam[4]);
-        recCalib->SetEZP1MaxValue(physRecParam[5]);
-        recCalib->SetEZDC1MaxValue(physRecParam[6]);
-        recCalib->SetEZN2MaxValue(physRecParam[7]);
-        recCalib->SetEZP2MaxValue(physRecParam[8]);
-        recCalib->SetEZDC2MaxValue(physRecParam[9]);
-       }
-       else{
-         Log(Form("File %s not found", physFileName));
+     Log(Form("\n\t Getting file #%d\n",++i));
+     TString stringLASERFileName = GetFile(kDAQ, "LASERDATA", source->GetName());
+     if(stringLASERFileName.Length() <= 0){
+       Log(Form("No LASER file from source %s!", source->GetName()));
+       return 1;
+     }
+     // --- Initializing pedestal calibration object
+     AliZDCLaserCalib *lCalib = new AliZDCLaserCalib("ZDC");
+     // --- Reading file with pedestal calibration data
+     const char* laserFileName = stringLASERFileName.Data();
+     if(laserFileName){
+       FILE *file;
+       if((file = fopen(laserFileName,"r")) == NULL){
+         printf("Cannot open file %s \n",laserFileName);
          return 1;
        }
-       //calibdata->Print("");
-      // 
-      AliCDBMetaData metaData;
-      metaData.SetBeamPeriod(0);
-      metaData.SetResponsible("Chiara");
-      metaData.SetComment("Filling AliZDCCalib object");  
-      //
-      resRecPar = Store("Calib","RecParam",recCalib, &metaData, 0, 1);
+       Log(Form("File %s connected to process data from LASER events", laserFileName));
+       //
+       Float_t ivalRead[22][4]; 
+       for(Int_t j=0; j<22; j++){
+         for(Int_t k=0; k<4; k++){
+           int aleggi = fscanf(file,"%f",&ivalRead[j][k]);
+           if(aleggi==0) AliDebug(3," Failng reading data from laser file");
+            //printf(" %d %1.0f  ",k, ivalRead[j][k]);
+          }
+          lCalib->SetDetector(j, (Int_t) ivalRead[j][0]);
+          lCalib->SetSector(j, (Int_t) ivalRead[j][1]);
+          lCalib->SetfPMValue(j, ivalRead[j][2]);
+          lCalib->SetfPMWidth(j, ivalRead[j][3]);
+       }
+       fclose(file);
+     }
+     else{
+       Log(Form("File %s not found", laserFileName));
+       return 1;
+     }
+     //lCalib->Print("");
+     // 
+     AliCDBMetaData metaData;
+     metaData.SetBeamPeriod(0);
+     metaData.SetResponsible("Chiara Oppedisano");
+     metaData.SetComment("Filling AliZDCLaserCalib object");  
+     //
+     resLaserCal = Store("Calib","LaserCalib",lCalib, &metaData, 0, 1);
+     if(resLaserCal==kFALSE) return 10;
   }
-} 
-else {
-  Log(Form("Nothing to do: run type is %s", runType.Data()));
+  delete daqSources; daqSources = 0;
+  
+  
+  TList* daqSourceH = GetFileSources(kDAQ, "LASERHISTOS");
+  if(!daqSourceH){
+    AliError(Form("No sources for STANDALONE_LASER run %d !", fRun));
+    return 1;
+  }
+  Log("\t List of DAQ sources for STANDALONE_LASER run");
+  daqSourceH->Print();
+  //
+  TIter iter2H(daqSourceH);
+  TObjString* sourceH = 0;
+  Int_t iH=0;
+  Bool_t resPedHist = kTRUE;
+  while((sourceH = dynamic_cast<TObjString*> (iter2H.Next()))){
+     Log(Form("\n\t Getting file #%d\n",++iH));
+     TString stringLASERFileName = GetFile(kDAQ, "LASERHISTOS", sourceH->GetName());
+     if(stringLASERFileName.Length() <= 0){
+       Log(Form("No LASER file from source %s!", sourceH->GetName()));
+       return 1;
+     }
+     TFile *histoFile = TFile::Open(stringLASERFileName.Data());
+     //
+     AliCDBMetaData metadata2;
+     metadata2.SetResponsible("Chiara Oppedisano");
+     metadata2.SetComment("Laser run histos");
+     resPedHist = StoreReferenceData("Histos", "Laser", histoFile, &metadata2);
+     //
+     if(resPedHist==kFALSE) return 11;
+  }
+  delete daqSourceH; daqSourceH = 0;
+  
   return 0;
-} 
+}
 
-  // note that the parameters are returned as character strings!
-  const char* nEvents = GetRunParameter("totalEvents");
-  if(nEvents) Log(Form("Number of events for run %d: %s",fRun, nEvents));
-  else Log(Form("Number of events not put in logbook!"));
-  UInt_t result = 0;
-  if(resDCSRef==kFALSE || resultAl==kFALSE || 
-     resPedCal==kFALSE || resECal==kFALSE || resRecPar==kFALSE){
-    if(resDCSRef == kFALSE) result = 1;
-    else if(resultAl == kFALSE)  result = 2;
-    else if(resPedCal == kFALSE) result = 3;
-    else if(resECal == kFALSE)   result = 4;
-    else if(resRecPar == kFALSE) result = 5;
-  }
+//______________________________________________________________________________________________
+UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
+{
+ UInt_t resDCS = 0;
+ UInt_t resChMap=0;
+ UInt_t resEnergyCalib=0, resPedestalCalib=0, resLaserCalib=0;
+
+ // ************************* Process DCS data ****************************
+ if(ProcessDCS()) resDCS = ProcessDCSData(dcsAliasMap);
   
-  return result;
+ // ********************************* From DAQ ************************************
+
+ const char* beamType = GetRunParameter("beamType");
+ TString runType = GetRunType();
+ printf("\n\t AliZDCPreprocessor -> beamType %s, runType %s\n",beamType,runType.Data());
+
+ // ******************************************
+ //   ADC channel mapping
+ // ******************************************
+ resChMap = ProcessChMap(runType);
+ // ******************************************
+ //   Calibration param. for p-p data (all = 1)
+ // ******************************************
+ // NO ENERGY CALIBRATION -> coefficients set to 1.
+ // Temp -> also inter-calibration coefficients are set to 1.
+ if(strcmp(beamType,"P-P")==0) resEnergyCalib = ProcessppData();
+ // *****************************************************
+ //  EMD EVENTS -> Energy calibration and equalization
+ // *****************************************************
+ if(runType=="CALIBRATION_EMD" && strcmp(beamType,"A-A")==0) 
+   resEnergyCalib =  ProcessCalibData();
+ // *****************************************************
+ // STANDALONE_PEDESTALS -> Pedestal subtraction 
+ // *****************************************************
+ if(runType=="STANDALONE_PEDESTAL") resPedestalCalib = ProcessPedestalData();
+ // *****************************************************
+ // STANDALONE_LASER -> Signal stability and ageing 
+ // *****************************************************
+ if(runType=="STANDALONE_LASER") resLaserCalib = ProcessLaserData();
+
+ if(resDCS!=0)               return resDCS;
+ else if(resChMap!=0)        return resChMap;
+ else if(resEnergyCalib!=0)   return resEnergyCalib;
+ else if(resPedestalCalib!=0) return resPedestalCalib;
+ else if(resLaserCalib!=0)    return resLaserCalib;
+ return 0;
   
 }