Preprocessor updated

diff --git a/ZDC/AliZDCPreprocessor.cxx b/ZDC/AliZDCPreprocessor.cxx
index ff9d5f4a1057a4d6e8366b4b5e2a354347ea7c55..f3729abf4de0f2829182d7ac0a2f17dfeae22d44 100644 (file)
--- a/ZDC/AliZDCPreprocessor.cxx
+++ b/ZDC/AliZDCPreprocessor.cxx
@@ -72,6 +72,12 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   // The processing of the DCS input data is forwarded to AliZDCDataDCS
   Float_t dcsValues[28]; // DCSAliases=28
   fData->ProcessData(*dcsAliasMap, dcsValues);
+  // Store DCS data for reference
+  AliCDBMetaData metadata;
+  metadata.SetResponsible("Chiara Oppedisano");
+  metadata.SetComment("DCS data for ZDC");
+  Bool_t resDCSRef = kFALSE;
+  resDCSRef = StoreReferenceData("DCS","Data",fData,&metadata);
   //dcsAliasMap->Print("");
   //
   // --- Writing ZDC table positions into alignment object
@@ -100,7 +106,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   AliCDBMetaData md;
   md.SetResponsible("Chiara Oppedisano");
   md.SetComment("Alignment object for ZDC");
-  Bool_t resultAl = kTRUE;
+  Bool_t resultAl = kFALSE;
   resultAl = Store("Align","Data", array, &md, 0, 0);
   
 // *************** From DAQ ******************
@@ -319,11 +325,13 @@ else {
   else Log(Form("Number of events not put in logbook!"));
  
   UInt_t result = 0;
-  if(resultAl==kFALSE || resPedCal==kFALSE || resECal==kFALSE || resRecPar==kFALSE){
-    if(resultAl == kFALSE) result = 1;
-    else if(resPedCal == kFALSE) result = 2;
-    else if(resECal == kFALSE)   result = 3;
-    else if(resRecPar == kFALSE) result = 4;
+  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;
   }
   
   return result;

diff --git a/ZDC/TestZDCPreprocessor.C b/ZDC/TestZDCPreprocessor.C
index 7a049817b65dd8152fea148c90942d10928d692c..40865d96699917cb23e2c2fc6bd763655dd2fdac 100644 (file)
--- a/ZDC/TestZDCPreprocessor.C
+++ b/ZDC/TestZDCPreprocessor.C
@@ -63,7 +63,6 @@ void TestZDCPreprocessor()
   // the "online" naming convention ALICE-INT-2003-039.
   shuttle->AddInputFile(AliTestShuttle::kDAQ, "ZDC", "PEDESTALS", "LDC0", "ZDCPedestal.dat");
   shuttle->AddInputFile(AliTestShuttle::kDAQ, "ZDC", "EMDCALIB",  "LDC0", "ZDCEMDCalib.dat");
-  shuttle->AddInputFile(AliTestShuttle::kDAQ, "ZDC", "EMDCALIB",  "LDC0", "ZDCEMDEqual.dat");
   shuttle->AddInputFile(AliTestShuttle::kDAQ, "ZDC", "PHYSICS",   "LDC0", "ZDCRecParam.dat");
 
   // TODO(3)
@@ -71,9 +70,9 @@ void TestZDCPreprocessor()
   // The shuttle can read run type stored in the DAQ logbook.
   // To test it, we must provide the run type manually. They will be retrieved in the preprocessor
   // using GetRunType function.
-//  shuttle->SetInputRunType("PEDESTAL_RUN");
-//  shuttle->SetInputRunType("PULSER_RUN");
-  shuttle->SetInputRunType("PHYSICS");
+ // shuttle->SetInputRunType("PEDESTAL_RUN");
+  shuttle->SetInputRunType("PULSER_RUN");
+//  shuttle->SetInputRunType("PHYSICS");
 
   // TODO(4)
   //
@@ -123,11 +122,12 @@ void TestZDCPreprocessor()
   /*AliCDBEntry* chkEntry = AliCDBManager::Instance()->GetStorage(AliShuttleInterface::GetMainCDB())
                        ->Get("ZDC/Calib/Pedestals", 7);
   */
-  /*AliCDBEntry* chkEntry = AliCDBManager::Instance()->GetStorage(AliShuttleInterface::GetMainCDB())
-                       ->Get("ZDC/Calib/Calib", 7);
-  */
   AliCDBEntry* chkEntry = AliCDBManager::Instance()->GetStorage(AliShuttleInterface::GetMainCDB())
+                       ->Get("ZDC/Calib/Calib", 7);
+  
+  /*AliCDBEntry* chkEntry = AliCDBManager::Instance()->GetStorage(AliShuttleInterface::GetMainCDB())
                        ->Get("ZDC/Calib/RecParam", 7);
+  */
   
   if (!chkEntry)
   {