From 4306fa22e1c914c3cea5de0aca798790f7372e3e Mon Sep 17 00:00:00 2001
From: decaro <decaro@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 21 Apr 2010 13:16:08 +0000
Subject: [PATCH] LTM-volumeID mapping: update (A.Silenzi)

---
 TOF/AliTOFRawStream.cxx | 125 +++++++++++++++++++++++-----------------
 1 file changed, 73 insertions(+), 52 deletions(-)

diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx
index 19e0181f8fd..ac0f517be18 100644
--- a/TOF/AliTOFRawStream.cxx
+++ b/TOF/AliTOFRawStream.cxx
@@ -151,71 +151,72 @@ const Int_t AliTOFRawStream::fgkddlBCshift[72] =
 };
 
 const Int_t AliTOFRawStream::fgkStrip0MapCrate0[]=
-  {3,5,1,9,11,7,15,17,13,2,-1,0,7,9,5,13,15,11,0,-1,17,-1,5,3};
+  {1,3,5,7,9,11,13,15,17,0,2,4,6,8,10,12,14,16,18,1,3,5,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate0[]=
-  {4,0,2,10,6,8,16,12,14,3,18,1,8,4,6,14,10,12,1,16,18,2,6,4};
+  {0,2,4,6,8,10,12,14,16,18,1,3,5,7,9,11,13,15,17,0,2,4,6,-1};
 const Int_t AliTOFRawStream::fgkStrip0MapCrate1[]=
-  {0,2,4,6,8,10,12,14,16,-1,0,2,4,6,8,10,12,14,-1,17,0,2,4,6};
+  {1,3,5,7,9,11,13,15,17,0,2,4,6,8,10,12,14,16,18,1,3,5,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate1[]=
-  {1,3,5,7,9,11,13,15,17,18,1,3,5,7,9,11,13,15,16,18,1,3,5,7};
+  {0,2,4,6,8,10,12,14,16,18,1,3,5,7,9,11,13,15,17,0,2,4,6,-1};
 const Int_t AliTOFRawStream::fgkStrip0MapCrate2[]=
-  {15,13,17,9,7,11,3,1,5,16,-1,18,11,9,13,5,3,7,14,-1,1,-1,9,11};
+  {17,15,13,11, 9,7,5,3,1,18,16,14,12,10,8,6,4,2, 0,13,11, 9,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate2[]=
-  {14,18,16,8,12,10,2,6,4,15,0,17,10,14,12,4,8,6,13,2,0,12,8,10};
+  {18,16,14,12,10,8,6,4,2, 0,17,15,13,11,9,7,5,3, 1,14,12,10,8,-1};
 const Int_t AliTOFRawStream::fgkStrip0MapCrate3[]=
-  {18,16,14,12,10,8,6,4,2,-1,18,16,14,12,10,8,6,4,-1,1,14,12,10,8};
+  {17,15,13,11, 9,7,5,3,1,18,16,14,12,10,8,6,4,2, 0,13,11, 9,7,-1};
 const Int_t AliTOFRawStream::fgkStrip1MapCrate3[]=
-  {17,15,13,11,9,7,5,3,1,0,17,15,13,11,9,7,5,3,2,0,13,11,9,7};
+  {18,16,14,12,10,8,6,4,2, 0,17,15,13,11,9,7,5,3, 1,14,12,10,8,-1};
 
 
 const Int_t AliTOFRawStream::fgkModule0MapCrate0[]=
-  {0,0,0,0,0,0,0,0,0,1,-1,1,1,1,1,1,1,1,2,-1,1,-1,2,2};
+  {0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate0[]=
-  {0,0,0,0,0,0,0,0,0,1,0,1,1,1,1,1,1,1,2,1,1,2,2,2};
+  {0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule0MapCrate1[]=
-  {0,0,0,0,0,0,0,0,0,-1,1,1,1,1,1,1,1,1,-1,1,2,2,2,2,2};
+  {0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate1[]=
-  {0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2};
+  {0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,2,2,2,2,-1};
+
 const Int_t AliTOFRawStream::fgkModule0MapCrate2[]=
-  {4,4,4,4,4,4,4,4,4,3,-1,3,3,3,3,3,3,3,2,-1,3,-1,2,2};
+  {4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate2[]=
-  {4,4,4,4,4,4,4,4,4,3,4,3,3,3,3,3,3,3,2,3,3,2,2,2};
+  {4,4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule0MapCrate3[]=
-  {4,4,4,4,4,4,4,4,4,-1,3,3,3,3,3,3,3,3,-1,3,2,2,2,2,2};
+  {4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 const Int_t AliTOFRawStream::fgkModule1MapCrate3[]=
-  {4,4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2};
+  {4,4,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,2,2,2,2,-1};
 
 const Int_t AliTOFRawStream::fgkChannelMap0[5][19]=
-  {{1,2,2,0,0,1,4,5,5,3,3,4,7,8,8,6,6,7,10},
-   {11,11,9,9,13,14,14,12,12,13,16,17,17,15,15,16,19,20,20},
-   {18,18,21,23,23,22,22,23,23,22,22,21,21,20,20,-1,-1,-1,-1},
-   {19,19,18,17,17,16,16,15,15,14,14,13,13,12,12,11,11,10,10},
+  {{0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9},
+   {9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18},
+   {19,19,20,20,21,21,22,22,22,21,21,20,20,19,19,-1,-1,-1,-1},
+   {18,18,17,17,16,16,15,15,14,14,13,13,12,12,11,11,10,10,9},
    {9,8,8,7,7,6,6,5,5,4,4,3,3,2,2,1,1,0,0}
   };
 
 const Int_t AliTOFRawStream::fgkChainMap0[5][19]=
-{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-{0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,-1,-1,-1,-1},
-{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
-{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}
-};
+  {{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+   {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+   {0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,-1,-1,-1,-1},
+   {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+   {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}
+  };
 
 const Int_t AliTOFRawStream::fgkChannelMap24[5][19]=
-{{0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9},
-{10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,19,19},
-{20,20,21,21,22,22,23,23,22,22,23,23,21,18,18,-1,-1,-1,-1},
-{20,20,19,16,15,15,17,17,16,13,12,12,14,14,13,9,9,11,11},
-{10,7,6,6,8,8,7,4,3,3,5,5,4,1,0,0,2,2,1}
-};
+  {{0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9},
+   {9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18},
+   {19,19,20,20,21,21,22,22,22,21,21,20,20,19,19,-1,-1,-1,-1},
+   {18,18,17,17,16,16,15,15,14,14,13,13,12,12,11,11,10,10,9},
+   {9,8,8,7,7,6,6,5,5,4,4,3,3,2,2,1,1,0,0}
+  };
 
 const Int_t AliTOFRawStream::fgkChainMap24[5][19]=
-{{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
-{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
-{1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,-1,-1,-1,-1},
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
-};
+  {{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+   {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+   {1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,-1,-1,-1,-1},
+   {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+   {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
+  };
 
 Bool_t AliTOFRawStream::fgApplyBCCorrections = kTRUE;
 //_____________________________________________________________________________
@@ -457,7 +458,7 @@ AliTOFRawStream& AliTOFRawStream::operator = (const AliTOFRawStream& stream)
   fInsideLTM = stream.fInsideLTM;
   fInsideTRMchain0 = stream.fInsideTRMchain0;
   fInsideTRMchain1 = stream.fInsideTRMchain1;
-  
+
   for (Int_t i=0;i<AliDAQ::NumberOfDdls("TOF");i++){ 
     fDataBuffer[i] = stream.fDataBuffer[i];
     fPackedDataBuffer[i] = stream.fPackedDataBuffer[i];
@@ -487,7 +488,7 @@ AliTOFRawStream& AliTOFRawStream::operator = (const AliTOFRawStream& stream)
 //_____________________________________________________________________________
 AliTOFRawStream::~AliTOFRawStream()
 {
-// destructor
+  // destructor
 
   fPackedDigits = 0;
 
@@ -2357,7 +2358,7 @@ void AliTOFRawStream::LTM2VolumeID(Int_t iDDL,
     iSector0 = (Int_t)(iDDL/4);
     iSector1 = (Int_t)(iDDL/4);
     Int_t iChan= iChannel+(iTDC-kFirstTDCnumber)*8;
-    if(iDDL%4 == 0 || iDDL%4 == 1 ){
+    if( iDDL%4 == 1 ){
       if(iChain==0){      //CRATE 0
         iPadX0=0;
         iPadX1=0;
@@ -2376,7 +2377,7 @@ void AliTOFRawStream::LTM2VolumeID(Int_t iDDL,
       }
 
     }
-    if(iDDL%4 == 2 || iDDL%4 == 3 ){
+    if( iDDL%4 == 3 ){
       if(iChain==1){// CRATE 3
         iPadX0=0;
         iPadX1=0;
@@ -2395,14 +2396,34 @@ void AliTOFRawStream::LTM2VolumeID(Int_t iDDL,
       }
     }
   }
-  detind1[0]=iSector1;
-  detind1[1]=iModule1;
-  detind1[2]=iStrip1;
-  detind1[3]=iPadX1;
-  detind1[4]=0;
-  detind0[0]=iSector0;
-  detind0[1]=iModule0;
-  detind0[2]=iStrip0;
-  detind0[3]=iPadX0;
-  detind0[4]=0;
+
+  if(iStrip1==-1 || iModule1==-1){
+    detind1[0]=-1;
+    detind1[1]=-1;
+    detind1[2]=-1;
+    detind1[3]=-1;
+    detind1[4]=-1;
+  }
+  else{
+    detind1[0]=iSector1;
+    detind1[1]=iModule1;
+    detind1[2]=iStrip1;
+    detind1[3]=iPadX1;
+    detind1[4]=0;
+  }
+
+  if(iStrip0==-1 || iModule0==-1){
+    detind0[0]=-1;
+    detind0[1]=-1;
+    detind0[2]=-1;
+    detind0[3]=-1;
+    detind0[4]=-1;
+  }
+  else{
+    detind0[0]=iSector0;
+    detind0[1]=iModule0;
+    detind0[2]=iStrip0;
+    detind0[3]=iPadX0;
+    detind0[4]=0;
+  }
 }
-- 
2.43.0