X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=RAW%2FAliCaloRawStreamV3.cxx;h=2153fb343f5088f8fc4110516d54f05a32a92092;hb=09ed5594a8b7db55b0a7fe70f025be11aefad2f3;hp=3babd1020b2bbf92767c5f978e126c57e676df5c;hpb=89de6b46132508ae877a1da196171dbe0814508e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RAW/AliCaloRawStreamV3.cxx b/RAW/AliCaloRawStreamV3.cxx
index 3babd1020b2..2153fb343f5 100644
--- a/RAW/AliCaloRawStreamV3.cxx
+++ b/RAW/AliCaloRawStreamV3.cxx
@@ -36,6 +36,7 @@
 #include <TString.h>
 #include <TSystem.h>
 
+#include "AliLog.h"
 #include "AliCaloRawStreamV3.h"
 #include "AliRawReader.h"
 #include "AliCaloAltroMapping.h"
@@ -50,7 +51,7 @@ AliCaloRawStreamV3::AliCaloRawStreamV3(AliRawReader* rawReader, TString calo, Al
   fRow(-1),
   fColumn(-1),
   fCaloFlag(0),
-  fFilter(0),
+  fNModules(0),
   fNRCU(0),
   fNSides(0),
   fCalo(calo),
@@ -59,34 +60,52 @@ AliCaloRawStreamV3::AliCaloRawStreamV3(AliRawReader* rawReader, TString calo, Al
   // create an object to read PHOS/EMCAL raw digits
   SelectRawData(calo);
 
-  // PHOS and EMCAL have differen number of RCU per module
-  //For PHOS
-  fNRCU = 4;
-  fNSides = 1;
-  //For EMCAL
-  TString sides[]={"A","C"};
+  // PHOS and EMCAL have different number of RCU per module
+  //For PHOS (different mappings for different modules)
+  if(fCalo == "PHOS")  {
+    fNModules = 5;
+    fNRCU     = 4;
+    fNSides   = 1;
+  }
+  //For EMCAL (the same mapping for all modules)
   if(fCalo == "EMCAL")  {
-    fNRCU = 2;
-    fNSides = 2;
+    fNModules = 1;
+    fNRCU     = 2;
+    fNSides   = 2;
   }
+  TString sides[]={"A","C"};
 
   if (mapping == NULL) {
+    // Read mapping files from $ALICE_ROOT/CALO/mapping/*.data
     TString path = gSystem->Getenv("ALICE_ROOT");
-    path += "/"+fCalo+"/mapping/RCU";
-    TString path2;
-    for(Int_t j = 0; j < fNSides; j++){
-      for(Int_t i = 0; i < fNRCU; i++) {
-	path2 = path;
-	path2 += i;
-	if(fCalo == "EMCAL") path2 += sides[j];
-	path2 += ".data";
-	fMapping[j*fNRCU+ i] = new AliCaloAltroMapping(path2.Data());
+    path += "/"+fCalo+"/mapping/";
+    TString path1, path2;
+    for(Int_t m = 0; m < fNModules; m++) {
+      path1 = path;
+      if     (fCalo == "EMCAL") {
+	path1 += "RCU";
+      }
+      else if(fCalo == "PHOS" ) {
+	path1 += "Mod";
+	path1 += m;
+	path1 += "RCU";
+      }
+      for(Int_t j = 0; j < fNSides; j++){
+	for(Int_t i = 0; i < fNRCU; i++) {
+	  path2 = path1;
+	  path2 += i;
+	  if(fCalo == "EMCAL") path2 += sides[j];
+	  path2 += ".data";
+	  AliDebug(2,Form("Mapping file: %s",path2.Data()));
+	  fMapping[m*fNSides*fNRCU + j*fNRCU + i] = new AliCaloAltroMapping(path2.Data());
+	}
       }
     }
   }
   else {
+    // Mapping is supplied by reconstruction
     fExternalMapping = kTRUE;
-    for(Int_t i = 0; i < fNRCU*fNSides; i++)
+    for(Int_t i = 0; i < fNModules*fNRCU*fNSides; i++)
       fMapping[i] = mapping[i];
   }
 }
@@ -98,12 +117,13 @@ AliCaloRawStreamV3::AliCaloRawStreamV3(const AliCaloRawStreamV3& stream) :
   fRow(-1),
   fColumn(-1),
   fCaloFlag(0),
-  fFilter(0),
+  fNModules(0),
   fNRCU(0),
   fNSides(0),
   fCalo(""),
   fExternalMapping(kFALSE)
 {  
+  // Dummy copy constructor
   Fatal("AliCaloRawStreamV3", "copy constructor not implemented");
 }
 
@@ -111,6 +131,7 @@ AliCaloRawStreamV3::AliCaloRawStreamV3(const AliCaloRawStreamV3& stream) :
 AliCaloRawStreamV3& AliCaloRawStreamV3::operator = (const AliCaloRawStreamV3& 
 					      /* stream */)
 {
+  // Dummy assignment operator
   Fatal("operator =", "assignment operator not implemented");
   return *this;
 }
@@ -121,17 +142,17 @@ AliCaloRawStreamV3::~AliCaloRawStreamV3()
 // destructor
 
   if (!fExternalMapping)
-    for(Int_t i = 0; i < fNRCU*fNSides; i++)
+    for(Int_t i = 0; i < fNModules*fNRCU*fNSides; i++)
       delete fMapping[i];
 }
 
 //_____________________________________________________________________________
 void AliCaloRawStreamV3::Reset()
 {
-  // reset phos/emcal raw stream params
+  // reset PHOS/EMCAL raw stream params
   AliAltroRawStreamV3::Reset();
   fModule = fRow = fColumn = -1;
-  fFilter = fCaloFlag = 0;
+  fCaloFlag = 0;
   fCalo="";
 }
 
@@ -144,12 +165,6 @@ Bool_t AliCaloRawStreamV3::NextChannel()
 
   if (AliAltroRawStreamV3::NextChannel()) {
     ApplyAltroMapping();
-    if ( fFilter > 0 ) { // some data should be filtered out
-      if ( (fFilter & (1<<fCaloFlag)) != 0) {  
-	// this particular data should be filtered out
-	NextChannel(); // go to the next address instead
-      }
-    }
     return kTRUE;
   }
   else
@@ -168,6 +183,7 @@ void AliCaloRawStreamV3::ApplyAltroMapping()
 
   Int_t rcuIndex = ddlNumber % fNRCU;
 
+  if( fNModules > 1) rcuIndex += fModule*fNRCU*fNSides;
   if( fNRCU == 2 ){ // EMCAL may need to increase RCU index for the maps
     if (fModule%2 == 1) { rcuIndex += 2; } // other='C' side maps
   }