X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerSubprocessor.cxx;h=11ff1c5eee48c69c7aa36a87a794f362ae81cf3c;hb=3a02e8fb664b43d4afd0815717b208a78c800ccc;hp=4207e82c1dcc1e170790d37dbdcc00270f2b9420;hpb=92c23b09d8263caf283ea958a86fd82f6fe74832;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerSubprocessor.cxx b/MUON/AliMUONTriggerSubprocessor.cxx
index 4207e82c1dc..11ff1c5eee4 100644
--- a/MUON/AliMUONTriggerSubprocessor.cxx
+++ b/MUON/AliMUONTriggerSubprocessor.cxx
@@ -40,6 +40,7 @@
 ///
 /// \author L. Aphecetche
 
+using std::ifstream;
 /// \cond CLASSIMP
 ClassImp(AliMUONTriggerSubprocessor)
 /// \endcond
@@ -84,7 +85,7 @@ AliMUONTriggerSubprocessor::GetFileName(const char* fid) const
 }
 
 //_____________________________________________________________________________
-void 
+Bool_t 
 AliMUONTriggerSubprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTime)
 {
   /// When starting a new run, reads in the trigger online files.
@@ -114,7 +115,7 @@ AliMUONTriggerSubprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTi
   {
     Master()->Log("FATAL ERROR : DA does not seem to have been run !!!");
     Master()->Invalidate();
-    return;
+    return kFALSE;
   }
   
   // OK. We have an exportedFiles.dat file at hand.
@@ -128,12 +129,17 @@ AliMUONTriggerSubprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTi
   WhichFilesToRead(GetFileName("EXPORTED").Data(),
                    globalFile,regionalFile,localFile,lutFile);
   
+  if ((globalFile+regionalFile+localFile+lutFile) == 0) {
+    Master()->Log("No file(s) to be processed for this run. Exiting.");
+    return kTRUE;
+  }
+  
   delete fRegionalConfig; fRegionalConfig = 0x0;
   delete fLocalMasks; fLocalMasks = 0x0;
   delete fGlobalConfig; fGlobalConfig = 0x0;
   delete fLUT; fLUT = 0x0;
   
-  Master()->Log(Form("Reading trigger masks for Run %d startTime %ld endTime %ld",
+  Master()->Log(Form("Reading trigger masks for Run %d startTime %u endTime %u",
                      run,startTime,endTime));
     
   Int_t check = 
@@ -144,25 +150,27 @@ AliMUONTriggerSubprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTi
 
   if ( check ) 
   {
-    Master()->Log("Could not read some input file(s). Aborting");
+    Master()->Log("Could not read some input file(s). Exiting");
     Master()->Invalidate();
-    return;
+    return kFALSE;
   }
   
+  if ( regionalFile ) globalFile = kTRUE;
+
   if ( regionalFile ) fRegionalConfig = new AliMUONRegionalTriggerConfig();
   if ( localFile ) fLocalMasks = new AliMUON1DArray(AliMpConstants::TotalNofLocalBoards()+1);
   if ( globalFile )   fGlobalConfig   = new AliMUONGlobalCrateConfig();
 
   AliMUONTriggerIO tio;
   
-  Bool_t ok = tio.ReadConfig(GetFileName("LOCAL").Data(),
-                            GetFileName("REGIONAL").Data(),
-                            GetFileName("GLOBAL").Data(),
-                            fLocalMasks,fRegionalConfig,fGlobalConfig);
+  Bool_t ok = tio.ReadConfig(localFile ? GetFileName("LOCAL").Data() : "",
+                             regionalFile ? GetFileName("REGIONAL").Data() : "",
+                             globalFile ? GetFileName("GLOBAL").Data() : "",
+                             fLocalMasks,fRegionalConfig,fGlobalConfig);
   
   if (!ok)
   {
-    Master()->Log("ERROR : ReadMasks failed");
+    Master()->Log("ERROR : ReadConfig failed");
     delete fLocalMasks;
     delete fRegionalConfig;
     delete fGlobalConfig;
@@ -175,7 +183,7 @@ AliMUONTriggerSubprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTi
   {
     fLUT = new AliMUONTriggerLut;
     
-    Master()->Log(Form("Reading trigger LUT for Run %d startTime %ld endTime %ld",
+    Master()->Log(Form("Reading trigger LUT for Run %d startTime %u endTime %u",
                        run,startTime,endTime));
   
     ok = tio.ReadLUT(GetFileName("LUT").Data(),*fLUT);
@@ -187,6 +195,7 @@ AliMUONTriggerSubprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTi
       fLUT = 0x0;
     }
   }
+  return kTRUE;
 }
 
 //_____________________________________________________________________________
@@ -221,13 +230,13 @@ AliMUONTriggerSubprocessor::Process(TMap* /*dcsAliasMap*/)
   
   if ( fGlobalConfig ) 
   {
-    result1 = Master()->Store("Calib", "GlobalTriggerBoardMasks", fGlobalConfig, 
+    result1 = Master()->Store("Calib", "GlobalTriggerCrateConfig", fGlobalConfig, 
                               &metaData, 0, validToInfinity);
   }
   
   if ( fRegionalConfig && fRegionalConfig->GetNofTriggerCrates() > 0 )
   {
-    result2 = Master()->Store("Calib", "RegionalTriggerBoardMasks", fRegionalConfig, 
+    result2 = Master()->Store("Calib", "RegionalTriggerConfig", fRegionalConfig, 
                               &metaData, 0, validToInfinity);
   }