From 720d923af2952a15e0ee79e8b6d62ea8d6442999 Mon Sep 17 00:00:00 2001
From: prino <prino@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 12 Sep 2008 14:30:37 +0000
Subject: [PATCH] Fix bug affecting the data decoding in the DAs (F. Prino)

---
 ITS/AliITSRawStreamSDD.cxx           | 3 ---
 ITS/AliITSRawStreamSDD.h             | 5 ++++-
 ITS/AliITSRawStreamSDDCompressed.cxx | 2 --
 ITS/AliITSRawStreamSDDCompressed.h   | 6 +++++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ITS/AliITSRawStreamSDD.cxx b/ITS/AliITSRawStreamSDD.cxx
index c0ad643ef65..75f2e8136ba 100644
--- a/ITS/AliITSRawStreamSDD.cxx
+++ b/ITS/AliITSRawStreamSDD.cxx
@@ -42,8 +42,6 @@ fEightBitSignal(0),
 fDecompressAmbra(kTRUE)
 {
 // create an object to read ITS SDD raw digits
-  fDDLModuleMap=new AliITSDDLModuleMapSDD();
-  fDDLModuleMap->SetDefaultMap();
   Reset();
   for(Int_t im=0;im<kSDDModules;im++){
     fLowThresholdArray[im][0]=0;
@@ -199,7 +197,6 @@ Bool_t AliITSRawStreamSDD::Next()
 	  fCoord1 = fAnode[fCarlosId][fChannel];
 	  fCoord2 = fTimeBin[fCarlosId][fChannel];
 	  fTimeBin[fCarlosId][fChannel]++;
-	  //printf("Data read, Module=%d , Anode=%d , Time=%d , Charge=%d\n",fModuleID,fCoord1,fCoord2,fSignal);
 	  return kTRUE;
 	}
       }
diff --git a/ITS/AliITSRawStreamSDD.h b/ITS/AliITSRawStreamSDD.h
index a17bc97519d..d0ca61e641f 100644
--- a/ITS/AliITSRawStreamSDD.h
+++ b/ITS/AliITSRawStreamSDD.h
@@ -37,12 +37,15 @@ class AliITSRawStreamSDD: public AliITSRawStream {
     virtual void     SetDecompressAmbra(Bool_t deco=kTRUE){
       fDecompressAmbra=deco;
     }
-    virtual void SetDDLModuleMap(AliITSDDLModuleMapSDD* ddlsdd){fDDLModuleMap->SetDDLMap(ddlsdd);}
+    virtual void SetDDLModuleMap(AliITSDDLModuleMapSDD* ddlsdd){
+      if(!fDDLModuleMap) fDDLModuleMap=new AliITSDDLModuleMapSDD();
+      fDDLModuleMap->SetDDLMap(ddlsdd);}
     virtual void     SetLowCarlosThreshold(Int_t th, Int_t i)
       {fLowThreshold[i]=th;}
     virtual void     SetZeroSuppLowThreshold(Int_t iMod, Int_t iSid, Int_t th) 
       {fLowThresholdArray[iMod][iSid]=th;}
     Int_t   GetModuleNumber(UInt_t iDDL, UInt_t iModule) const {
+      if(!fDDLModuleMap) return kSPDModules+1; // dummy module number if the DDL map is not set (case of DAs)
       return fDDLModuleMap->GetModuleNumber(iDDL,iModule);
     }
     virtual void     Reset(); 
diff --git a/ITS/AliITSRawStreamSDDCompressed.cxx b/ITS/AliITSRawStreamSDDCompressed.cxx
index 11bf8ac2380..d08f8f93435 100644
--- a/ITS/AliITSRawStreamSDDCompressed.cxx
+++ b/ITS/AliITSRawStreamSDDCompressed.cxx
@@ -81,8 +81,6 @@ fJitter(0),
 fDDL(0)
 {
 // create an object to read ITS SDD raw digits
-  fDDLModuleMap=new AliITSDDLModuleMapSDD();
-  fDDLModuleMap->SetDefaultMap();
   for(Int_t im=0;im<kSDDModules;im++){
     fLowThresholdArray[im][0]=0;
     fLowThresholdArray[im][1]=0;
diff --git a/ITS/AliITSRawStreamSDDCompressed.h b/ITS/AliITSRawStreamSDDCompressed.h
index 9e09868046d..368f0415b50 100644
--- a/ITS/AliITSRawStreamSDDCompressed.h
+++ b/ITS/AliITSRawStreamSDDCompressed.h
@@ -33,10 +33,14 @@ class AliITSRawStreamSDDCompressed: public AliITSRawStream {
     virtual Int_t    ReadJitter() const {return 0;}
     virtual Int_t    GetCarlosId() const {return fCarlosId;}
 
-    virtual void SetDDLModuleMap(AliITSDDLModuleMapSDD* ddlsdd){fDDLModuleMap->SetDDLMap(ddlsdd);}
+    virtual void SetDDLModuleMap(AliITSDDLModuleMapSDD* ddlsdd){
+      if(!fDDLModuleMap) fDDLModuleMap=new AliITSDDLModuleMapSDD();
+      fDDLModuleMap->SetDDLMap(ddlsdd);
+    }
     virtual void     SetZeroSuppLowThreshold(Int_t iMod, Int_t iSid, Int_t th) 
       {fLowThresholdArray[iMod][iSid]=th;}
     Int_t   GetModuleNumber(UInt_t iDDL, UInt_t iModule) const {
+      if(!fDDLModuleMap) return kSPDModules+1; // dummy module number if the DDL map is not set (case of DAs)
       return fDDLModuleMap->GetModuleNumber(iDDL,iModule);
     }
 
-- 
2.39.3