X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTrackerPreprocessor.cxx;h=0b18b2c58dd548a1359000999b6d10d3f84abd67;hb=e946305455fc7d733d123a61a2953d761a04466d;hp=637d66e5a570e4c2c1a08f858726d2db0d66ee95;hpb=505bc49673ac522eb8f8f908b957dcac55d9f05f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTrackerPreprocessor.cxx b/MUON/AliMUONTrackerPreprocessor.cxx
index 637d66e5a57..0b18b2c58dd 100644
--- a/MUON/AliMUONTrackerPreprocessor.cxx
+++ b/MUON/AliMUONTrackerPreprocessor.cxx
@@ -21,12 +21,14 @@
 #include "AliMUONHVSubprocessor.h"
 #include "AliMUONGMSSubprocessor.h"
 #include "AliMUONGainSubprocessor.h"
+#include "AliMUONOccupancySubprocessor.h"
 
 #include "AliLog.h"
 #include "AliShuttleInterface.h"
 #include "Riostream.h"
 #include "TObjArray.h"
 
+//-----------------------------------------------------------------------------
 /// \class AliMUONTrackerPreprocessor
 ///
 /// Shuttle preprocessor for MUON tracker
@@ -35,6 +37,7 @@
 /// (of type AliMUONVSubprocessor).
 ///
 /// \author Laurent Aphecetche
+//-----------------------------------------------------------------------------
 
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackerPreprocessor)
@@ -43,12 +46,18 @@ ClassImp(AliMUONTrackerPreprocessor)
 //_____________________________________________________________________________
 AliMUONTrackerPreprocessor::AliMUONTrackerPreprocessor(AliShuttleInterface* shuttle)
 : AliMUONPreprocessor("MCH",shuttle),
-  fPedestalSubprocessor(new AliMUONPedestalSubprocessor(this)),
-  fGMSSubprocessor(new AliMUONGMSSubprocessor(this)),    
-  fHVSubprocessor(new AliMUONHVSubprocessor(this)),
-  fGainSubprocessor(new AliMUONGainSubprocessor(this))
+fPedestalSubprocessor(new AliMUONPedestalSubprocessor(this)),
+fGMSSubprocessor(new AliMUONGMSSubprocessor(this)),    
+fHVSubprocessor(new AliMUONHVSubprocessor(this,kTRUE)),
+fGainSubprocessor(new AliMUONGainSubprocessor(this)),
+fOccupancySubprocessor(new AliMUONOccupancySubprocessor(this))
 {
   /// ctor. 
+    
+    AddRunType("PEDESTAL");
+    AddRunType("CALIBRATION");
+    AddRunType("GMS");
+    AddRunType("PHYSICS");
 }
 
 //_____________________________________________________________________________
@@ -60,41 +69,52 @@ AliMUONTrackerPreprocessor::~AliMUONTrackerPreprocessor()
   delete fGMSSubprocessor;
   delete fHVSubprocessor;
   delete fGainSubprocessor;
+  delete fOccupancySubprocessor;
 }
 
 //_____________________________________________________________________________
 void
 AliMUONTrackerPreprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTime)
 {
-  /// Re-register the subprocessor(s) depnding on the actual runTYpe
+  /// Re-register the subprocessor(s) depending on the actual runType
 
   ClearSubprocessors();
   
   TString runType = GetRunType();
   
-  if ( runType == "PEDESTAL_RUN" ) // FIXME : check the name
+  fIsValid = kTRUE;
+  fIsApplicable = kTRUE;
+  
+  if ( runType == "PEDESTAL" )
   {
     Add(fPedestalSubprocessor); // to be called only for pedestal runs
     Log("INFO-Will run Pedestal subprocessor");
   }
-  else if ( runType == "ELECTRONICS_CALIBRATION_RUN" ) // FIXME : check the name
+  else if ( runType == "CALIBRATION" )
   {
-    Add(new AliMUONGainSubprocessor(this)); // to be called only for gain runs
+    Add(fGainSubprocessor); // to be called only for gain runs
     Log("INFO-Will run Gain subprocessor");
   }
-  else if ( runType == "GMS" ) // FIXME : check the name
+  else if ( runType == "GMS" )
   {
     Add(fGMSSubprocessor);
     Log("INFO-Will run GMS subprocessor");
   }
-  else if ( runType == "PHYSICS" ) // FIXME : check the name
+  else if ( runType == "PHYSICS" )
   {
-    Add(fHVSubprocessor); // to be called only for physics runs
+    Bool_t useDCS(kTRUE);
+    Add(fHVSubprocessor,useDCS); // to be called only for physics runs
+    Add(fOccupancySubprocessor);
     Log("INFO-Will run HV subprocessor");
+    if ( fHVSubprocessor->IncludeHVCurrent() )
+    {
+      Log("INFO-HV subprocessor will store HV currents in addition to the voltages");
+    }
+    Log("INFO-Will run Occupancy subprocessor");
   }
   else
   {
-    Log(Form("ERROR-Unknown RunType=%",runType.Data()));
+    fIsApplicable = kFALSE;
   }
   
   AliMUONPreprocessor::Initialize(run,startTime,endTime);