Fix for ESD analysis

[u/mrichter/AliRoot.git] / ITS / AliITSPreprocessorSSD.cxx

diff --git a/ITS/AliITSPreprocessorSSD.cxx b/ITS/AliITSPreprocessorSSD.cxx
index fd579f23cc62f0f00d8f4687e1871bbe59a69e85..1e5be96563311dd68daa91fba3ff3eda4a4102cb 100644 (file)
--- a/ITS/AliITSPreprocessorSSD.cxx
+++ b/ITS/AliITSPreprocessorSSD.cxx
@@ -1,3 +1,11 @@
+//
+// Author: Enrico Fragiacomo
+// Date: 13/10/2006
+// 
+// SHUTTLE preprocessing class for SSD calibration files
+
+/* $Id$ */
+
 #include "AliITSPreprocessorSSD.h"
  
 #include "AliCDBMetaData.h"
@@ -8,20 +16,12 @@
 #include <TObjString.h>
 
 #include "AliITSRawStreamSSD.h"
-#include "AliITSNoiseSSD.h"
-#include "AliITSPedestalSSD.h"
-#include "AliITSBadChannelsSSD.h"
+#include "AliITSNoiseSSDv2.h"
+#include "AliITSPedestalSSDv2.h"
+#include "AliITSBadChannelsSSDv2.h"
 #include <Riostream.h>
 
 
-//
-// Author: Enrico Fragiacomo
-// Date: 13/10/2006
-// 
-// SHUTTLE preprocessing class for SSD calibration files
-
-/* $Id$ */
-
 const Int_t AliITSPreprocessorSSD::fgkNumberOfSSD = 1698;
 
 ClassImp(AliITSPreprocessorSSD)
@@ -38,11 +38,12 @@ AliITSPreprocessorSSD::AliITSPreprocessorSSD(AliShuttleInterface* shuttle) :
 
 }
 
-///______________________________________________________________________________________________
+//______________________________________________________________________________________________
 void AliITSPreprocessorSSD::Initialize(Int_t run, UInt_t startTime,
        UInt_t endTime)
 {
- 
+  // initialize
+
   AliPreprocessor::Initialize(run, startTime, endTime);
   
   Log(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", run,
@@ -65,9 +66,9 @@ UInt_t AliITSPreprocessorSSD::Process(TMap* /*dcsAliasMap*/)
   
   //---------------------------------------
   // initialize the calibration objects
-  AliITSNoiseSSD *calib = new AliITSNoiseSSD();
-  AliITSBadChannelsSSD *badch = new AliITSBadChannelsSSD();
-  AliITSPedestalSSD *pedel = new AliITSPedestalSSD();
+  AliITSNoiseSSDv2 *calib = new AliITSNoiseSSDv2();
+  AliITSBadChannelsSSDv2 *badch = new AliITSBadChannelsSSDv2();
+  AliITSPedestalSSDv2 *pedel = new AliITSPedestalSSDv2();
   
   TString runType = GetRunType();
   if(runType == "ELECTRONICS_CALIBRATION_RUN") {
@@ -102,22 +103,22 @@ UInt_t AliITSPreprocessorSSD::Process(TMap* /*dcsAliasMap*/)
                return 2;
            }
            
-           AliITSNoiseSSD *cal; 
-           f->GetObject("AliITSNoiseSSD;1", cal); 
+           AliITSNoiseSSDv2 *cal; 
+           f->GetObject("AliITSNoiseSSDv2;1", cal); 
            if(!cal) {
                Log("File does not contain expected data for the noise!");
                delete list;
                return 3;
            }       
-           AliITSPedestalSSD *ped;
-           f->GetObject("AliITSPedestalSSD;1", ped); 
+           AliITSPedestalSSDv2 *ped;
+           f->GetObject("AliITSPedestalSSDv2;1", ped); 
            if(!ped) {
                Log("File does not contain expected data for the pedestals!");
                delete list;
                return 5;
            }       
-           AliITSBadChannelsSSD *bad;
-           f->GetObject("AliITSBadChannelsSSD;1", bad); 
+           AliITSBadChannelsSSDv2 *bad;
+           f->GetObject("AliITSBadChannelsSSDv2;1", bad); 
            if(!bad) {
                Log("File does not contain expected data for bad channels  !");
                delete list;
@@ -177,7 +178,7 @@ UInt_t AliITSPreprocessorSSD::Process(TMap* /*dcsAliasMap*/)
         return 1;
       }  
       
-      if(!StoreReferenceData("Calib","PedestalSSD",  (TObject*)pedel, &metaData)) {
+      if(!StoreReferenceData("Ref","PedestalSSD",  (TObject*)pedel, &metaData)) {
        Log("no store");
        return 1;
       }