Serious bug fix! The SSD raw-data has not been simulated since v4-10-Relese! Please...

diff --git a/ITS/AliITSRawStreamSSD.cxx b/ITS/AliITSRawStreamSSD.cxx
index db907f2042e4d4b19094501b73022e5a7022bd31..3ca0065cc4c8c1b6cb4e9f964b1ab86964e60a8f 100644 (file)
--- a/ITS/AliITSRawStreamSSD.cxx
+++ b/ITS/AliITSRawStreamSSD.cxx
@@ -26,13 +26,15 @@
 #include "Riostream.h"
 #include "TGeoManager.h"
 #include "TGeoVolume.h"
+#include <TClass.h>
 
 #include "AliITSRawStreamSSD.h"
 #include "AliRawReader.h"
 #include "AliLog.h"
 
 ClassImp(AliITSRawStreamSSD)
-  
+
+Bool_t AliITSRawStreamSSD::fgkDDLModuleMapInit = kFALSE;  
 Int_t AliITSRawStreamSSD::fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {
   {0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,0,
@@ -224,6 +226,38 @@ AliITSRawStreamSSD::AliITSRawStreamSSD(AliRawReader* rawReader) :
   fRawReader->Select("ITSSSD");
 }
 
+Int_t AliITSRawStreamSSD::GetModuleNumber(UInt_t iDDL, UInt_t iModule)
+{
+  if (!fgkDDLModuleMapInit) {
+    if (!InitDDLModuleMap()) return -1;
+  }
+  return fgkDDLModuleMap[iDDL][iModule];
+}
+
+Bool_t AliITSRawStreamSSD::InitDDLModuleMap()
+{
+  // Initialize the DDL
+  // module map
+  if(!gGeoManager){
+    AliErrorClass("Geometry is not initialized\n");
+    return kFALSE;
+  }
+  TGeoVolume *v = NULL;
+  v = gGeoManager->GetVolume("ITSssdSensitivL5");
+  if(!v) {
+    // new geometry AliITSvPPRasymmFMD
+    AliInfoClass(Form("Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD"));
+    SetvPPRasymmFMDDDLMapping();
+  }
+  else {
+    // new geometry AliITSv11Hybrid
+    AliInfoClass(Form("Enabling the SSD DDL mapping for the AliITSv11Hybrid"));
+    Setv11HybridDDLMapping();
+  }
+  fgkDDLModuleMapInit = kTRUE;
+  return kTRUE;
+}
+
 void AliITSRawStreamSSD::Setv11HybridDDLMapping() {
   //DDL mapping v11Hybrid
   Int_t kDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {

diff --git a/ITS/AliITSRawStreamSSD.h b/ITS/AliITSRawStreamSSD.h
index 3c9f03a8bbe828854bfb0684ca5737f6ac87027d..a21d3f0ed47eca871a00b33fa0c740c2ba7709d7 100644 (file)
--- a/ITS/AliITSRawStreamSSD.h
+++ b/ITS/AliITSRawStreamSSD.h
@@ -31,14 +31,14 @@ class AliITSRawStreamSSD: public AliITSRawStream {
     Int_t GetAD() const {return fad;}
     Int_t GetADC() const {return fadc;}
 
-    void Setv11HybridDDLMapping();
-    void SetvPPRasymmFMDDDLMapping();
+    static Bool_t InitDDLModuleMap();  // Initialize DLL module map
+    static void Setv11HybridDDLMapping();
+    static void SetvPPRasymmFMDDDLMapping();
 
     enum {kDDLsNumber = 16};      // number of DDLs in SSD
     enum {kModulesPerDDL = 108};  // number of modules in each DDL
 
-    static Int_t     GetModuleNumber(UInt_t iDDL, UInt_t iModule)
-      {return fgkDDLModuleMap[iDDL][iModule];}
+    static Int_t     GetModuleNumber(UInt_t iDDL, UInt_t iModule);
 
     enum ESSDRawStreamError {
       kWrongModuleIdErr = 1
@@ -51,6 +51,7 @@ class AliITSRawStreamSSD: public AliITSRawStream {
     Bool_t flag;
 
   protected :
+    static Bool_t fgkDDLModuleMapInit; // Module map is initialized or not
     static Int_t fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL];  // mapping DDL/module -> module number
 
     UInt_t           fData;         // data read for file