Final (?) changes

diff --git a/ZDC/AliZDCDataDCS.cxx b/ZDC/AliZDCDataDCS.cxx
index f96621eb780c3db7b208e0b7ddcdf0e376fed5c2..734f1aefad6f85c6a52b5cedb3830e19993bd7bd 100644 (file)
--- a/ZDC/AliZDCDataDCS.cxx
+++ b/ZDC/AliZDCDataDCS.cxx
@@ -88,7 +88,7 @@ void AliZDCDataDCS::ProcessData(TMap& aliasMap, Float_t *fCalibData)
       while((aValue = (AliDCSValue*) iterarray.Next())) {
        val[ne] = aValue->GetFloat();
        time[ne] = (Double_t) (aValue->GetTimeStamp());
-       fCalibData[ne] = val[ne];
+       if(j>=4) fCalibData[ne] = val[ne];
        ne++;
       }
       //
@@ -152,7 +152,7 @@ void AliZDCDataDCS::Introduce(UInt_t numAlias, const TObjArray* aliasArr)
 {
    // Getting array of DCS aliases
    
-   int entries=aliasArr->GetEntries();
+   int entries = aliasArr->GetEntries();
    AliInfo(Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
    AliInfo(Form("         %d DP values collected",entries));
 

diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index 474a2a936f69cf5e318a726e81c91d0e2535b652..18147db6d1dbfd5f7f25437d25a8ef1c82a297c3 100644 (file)
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -480,10 +480,10 @@ AliZDCCalibData* AliZDCDigitizer::GetCalibData() const
   // Getting calibration object for ZDC set
 
   AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/Data");
-  if(!entry) AliFatal("No ZDC calibration found in OCDB!");
-  //
-  AliZDCCalibData *calibdata = (AliZDCCalibData*) entry->GetObject();
-  if(!calibdata)  AliWarning("No calibration data from calibration database !");
+  if(!entry) AliFatal("No calibration data loaded!");  
+
+  AliZDCCalibData *calibdata = dynamic_cast<AliZDCCalibData*>  (entry->GetObject());
+  if(!calibdata)  AliFatal("Wrong calibration object in calibration  file!");
 
   return calibdata;
 }

diff --git a/ZDC/AliZDCPreprocessor.cxx b/ZDC/AliZDCPreprocessor.cxx
index 1884ff8d4db1f7fc8725ab489a55a340a080da60..19fb791184e9275df008da21cdebf046e0f4d8fc 100644 (file)
--- a/ZDC/AliZDCPreprocessor.cxx
+++ b/ZDC/AliZDCPreprocessor.cxx
@@ -108,7 +108,6 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   // *************** From DAQ ******************
   // [a] PEDESTALS
 TString runType = GetRunType();
-if(runType = "PEDESTALS") {
   TList* daqSources = GetFileSources(kDAQ, "PEDESTALS");
   if(!daqSources){
     Log(Form("No source for PEDESTALS run %d !", fRun));
@@ -163,9 +162,8 @@ if(runType = "PEDESTALS") {
       //calibdata->Print("");
   }
   delete daqSources; daqSources = 0;
-}
   // [a] EMD EVENTS
-else if (runType = "EMD") {
+if (runType != "PEDESTALS") {
   TList* daqSources = GetFileSources(kDAQ, "EMDCALIB");
   if(!daqSources){
     AliError(Form("No sources for EMDCALIB run %d !", fRun));

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 86a4a52bf29837a925c6234ad4427d0d0406094b..38982067b855dba45d0fecf2f129512679fe7c5b 100644 (file)
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -370,9 +370,10 @@ AliZDCCalibData* AliZDCReconstructor::GetCalibData() const
   // Getting calibration object for ZDC set
 
   AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/Data");
-  AliZDCCalibData *calibdata = (AliZDCCalibData*) entry->GetObject();
+  if(!entry) AliFatal("No calibration data loaded!");  
 
-  if (!calibdata)  AliWarning("No calibration data from calibration database !");
+  AliZDCCalibData *calibdata = dynamic_cast<AliZDCCalibData*>  (entry->GetObject());
+  if(!calibdata)  AliFatal("Wrong calibration object in calibration  file!");
 
   return calibdata;
 }