Official Numbering for salts in St345 as described in ref Alice-int-2003-038 emds...

Removing obsolete constructor in AliMUONHitMapA1 (Christian)

diff --git a/MUON/AliMUONDigitizer.cxx b/MUON/AliMUONDigitizer.cxx
index 970e7e67237cee9a35793b71d98fa1ebce130494..1d35da4f55f014b51f2bec6c11516abe82510111 100644 (file)
--- a/MUON/AliMUONDigitizer.cxx
+++ b/MUON/AliMUONDigitizer.cxx
@@ -506,11 +506,11 @@ void AliMUONDigitizer::InitArrays()
     for (Int_t i = 0; i < AliMUONConstants::NCh(); i++) {
 
       Int_t idDE = 100*(i+1);// central DE = max # of pads ?
-      if (i == 4 || i == 5) //St3
-       idDE += 4;
+//       if (i == 4 || i == 5) //St3
+//     idDE += 4;
 
-      if (i > 5)
-       idDE += 5;// DE for max # of pads in St45 and Trigger Station
+//       if (i > 5)
+//      idDE += 5;// DE for max # of pads in St45 and Trigger Station
 
       AliDebug(4,Form( "Creating hit map for chamber %d, cathode 1.", i+1));
       AliMUONChamber* chamber = &(fMUON->Chamber(i));

diff --git a/MUON/AliMUONFactoryV2.cxx b/MUON/AliMUONFactoryV2.cxx
index 1a39a6d6183db32cf30d4b1f1a9e282f3565cab4..65e2012979a07af45579a7c2a6a66e6993751297 100644 (file)
--- a/MUON/AliMUONFactoryV2.cxx
+++ b/MUON/AliMUONFactoryV2.cxx
@@ -342,59 +342,58 @@ void AliMUONFactoryV2::BuildStation3()
 
     // cathode 0
     // type 220000
-    segmentation[0]->Add(id0, slatsegB[3]);
-    segmentation[0]->Add(id0+ 8, slatsegB[3]);  
-    segmentation[0]->Add(id0+50, slatsegB[3]);  
-    segmentation[0]->Add(id0+58, slatsegB[3]);
+    segmentation[0]->Add(id0+14, slatsegB[3]);
+    segmentation[0]->Add(id0+ 4, slatsegB[3]);  
+    segmentation[0]->Add(id0+13, slatsegB[3]);  
+    segmentation[0]->Add(id0+ 5, slatsegB[3]);
     // type 222000
-    segmentation[0]->Add(id0+ 1, slatsegB[2]);
-    segmentation[0]->Add(id0+ 7, slatsegB[2]);  
-    segmentation[0]->Add(id0+51, slatsegB[2]);  
-    segmentation[0]->Add(id0+57, slatsegB[2]);
+    segmentation[0]->Add(id0+15, slatsegB[2]);
+    segmentation[0]->Add(id0+ 3, slatsegB[2]);  
+    segmentation[0]->Add(id0+12, slatsegB[2]);  
+    segmentation[0]->Add(id0+ 6, slatsegB[2]);
     // type 122200
-    segmentation[0]->Add(id0+ 2, slatsegB[1]);
-    segmentation[0]->Add(id0+ 6, slatsegB[1]);  
-    segmentation[0]->Add(id0+52, slatsegB[1]);  
-    segmentation[0]->Add(id0+56, slatsegB[1]);
+    segmentation[0]->Add(id0+16, slatsegB[1]);
+    segmentation[0]->Add(id0+ 2, slatsegB[1]);  
+    segmentation[0]->Add(id0+11, slatsegB[1]);  
+    segmentation[0]->Add(id0+ 7, slatsegB[1]);
     // type 112200
-    segmentation[0]->Add(id0+ 3, slatsegB[0]);
-    segmentation[0]->Add(id0+ 4, slatsegB[0]);  
-    segmentation[0]->Add(id0+ 5, slatsegB[0]);  
-    segmentation[0]->Add(id0+53, slatsegB[0]);
-    segmentation[0]->Add(id0+54, slatsegB[0]);     
-    segmentation[0]->Add(id0+55, slatsegB[0]);
+    segmentation[0]->Add(id0+17, slatsegB[0]);
+    segmentation[0]->Add(id0, slatsegB[0]);  
+    segmentation[0]->Add(id0+ 1, slatsegB[0]);  
+    segmentation[0]->Add(id0+10, slatsegB[0]);
+    segmentation[0]->Add(id0+ 9, slatsegB[0]);     
+    segmentation[0]->Add(id0+ 8, slatsegB[0]);
     fMUON->SetSegmentationModel(chamber, 1, segmentation[0]);   
 
     // cathode 1
     // type 220000
-    segmentation[1]->Add(id0, slatsegNB[3]);
-    segmentation[1]->Add(id0+ 8, slatsegNB[3]);  
-    segmentation[1]->Add(id0+50, slatsegNB[3]);  
-    segmentation[1]->Add(id0+58, slatsegNB[3]);
+    segmentation[1]->Add(id0+14, slatsegNB[3]);
+    segmentation[1]->Add(id0+ 4, slatsegNB[3]);  
+    segmentation[1]->Add(id0+13, slatsegNB[3]);  
+    segmentation[1]->Add(id0+ 5, slatsegNB[3]);
     // type 222000
-    segmentation[1]->Add(id0+ 1, slatsegNB[2]);
-    segmentation[1]->Add(id0+ 7, slatsegNB[2]);  
-    segmentation[1]->Add(id0+51, slatsegNB[2]);  
-    segmentation[1]->Add(id0+57, slatsegNB[2]);
+    segmentation[1]->Add(id0+15, slatsegNB[2]);
+    segmentation[1]->Add(id0+ 3, slatsegNB[2]);  
+    segmentation[1]->Add(id0+12, slatsegNB[2]);  
+    segmentation[1]->Add(id0+ 6, slatsegNB[2]);
     // type 122200
-    segmentation[1]->Add(id0+ 2, slatsegNB[1]);
-    segmentation[1]->Add(id0+ 6, slatsegNB[1]);  
-    segmentation[1]->Add(id0+52, slatsegNB[1]);  
-    segmentation[1]->Add(id0+56, slatsegNB[1]);
+    segmentation[1]->Add(id0+16, slatsegNB[1]);
+    segmentation[1]->Add(id0+ 2, slatsegNB[1]);  
+    segmentation[1]->Add(id0+11, slatsegNB[1]);  
+    segmentation[1]->Add(id0+ 7, slatsegNB[1]);
     // type 112200
-    segmentation[1]->Add(id0+ 3, slatsegNB[0]);
-    segmentation[1]->Add(id0+ 4, slatsegNB[0]);  
-    segmentation[1]->Add(id0+ 5, slatsegNB[0]);  
-    segmentation[1]->Add(id0+53, slatsegNB[0]);
-    segmentation[1]->Add(id0+54, slatsegNB[0]);     
-    segmentation[1]->Add(id0+55, slatsegNB[0]);
+    segmentation[1]->Add(id0+17, slatsegNB[0]);
+    segmentation[1]->Add(id0, slatsegNB[0]);  
+    segmentation[1]->Add(id0+ 1, slatsegNB[0]);  
+    segmentation[1]->Add(id0+10, slatsegNB[0]);
+    segmentation[1]->Add(id0+ 9, slatsegNB[0]);     
+    segmentation[1]->Add(id0+ 8, slatsegNB[0]);
     fMUON->SetSegmentationModel(chamber, 2, segmentation[1]);
 
     fMUON->SetResponseModel(chamber, fResponse0);      
     fMUON->Chamber(chamber).SetChargeCorrel(0.11); // 11% charge spread
   }
 }
-
         
 //__________________________________________________________________________
 void AliMUONFactoryV2::BuildStation4() 
@@ -518,86 +517,86 @@ void AliMUONFactoryV2::BuildStation4()
 
     // cathode 0
     // type 122330
-    segmentation[0]->Add(id0+ 6, slatsegB[0]);
-    segmentation[0]->Add(id0+56, slatsegB[0]);
+    segmentation[0]->Add(id0+13, slatsegB[0]);
+    segmentation[0]->Add(id0   , slatsegB[0]);
   
     // type 112233
-    segmentation[0]->Add(id0+ 5, slatsegB[1]);
-    segmentation[0]->Add(id0+ 7, slatsegB[1]);  
-    segmentation[0]->Add(id0+55, slatsegB[1]);  
-    segmentation[0]->Add(id0+57, slatsegB[1]);
+    segmentation[0]->Add(id0+14, slatsegB[1]);
+    segmentation[0]->Add(id0+12, slatsegB[1]);  
+    segmentation[0]->Add(id0+25, slatsegB[1]);  
+    segmentation[0]->Add(id0+ 1, slatsegB[1]);
    
     // type 112230
-    segmentation[0]->Add(id0+ 4, slatsegB[2]);
-    segmentation[0]->Add(id0+ 8, slatsegB[2]);  
-    segmentation[0]->Add(id0+54, slatsegB[2]);  
-    segmentation[0]->Add(id0+58, slatsegB[2]);
+    segmentation[0]->Add(id0+15, slatsegB[2]);
+    segmentation[0]->Add(id0+11, slatsegB[2]);  
+    segmentation[0]->Add(id0+24, slatsegB[2]);  
+    segmentation[0]->Add(id0+ 2, slatsegB[2]);
 
     // type 222330 
+    segmentation[0]->Add(id0+16, slatsegB[3]);
+    segmentation[0]->Add(id0+10, slatsegB[3]);  
+    segmentation[0]->Add(id0+23, slatsegB[3]);
     segmentation[0]->Add(id0+ 3, slatsegB[3]);
-    segmentation[0]->Add(id0+ 9, slatsegB[3]);  
-    segmentation[0]->Add(id0+53, slatsegB[3]);
-    segmentation[0]->Add(id0+59, slatsegB[3]);
 
     // type 223300 
-    segmentation[0]->Add(id0+ 2, slatsegB[4]);
-    segmentation[0]->Add(id0+10, slatsegB[4]);  
-    segmentation[0]->Add(id0+52, slatsegB[4]);
-    segmentation[0]->Add(id0+60, slatsegB[4]);
+    segmentation[0]->Add(id0+17, slatsegB[4]);
+    segmentation[0]->Add(id0+ 9, slatsegB[4]);  
+    segmentation[0]->Add(id0+22, slatsegB[4]);
+    segmentation[0]->Add(id0+ 4, slatsegB[4]);
 
     // type 333000 
-    segmentation[0]->Add(id0+ 1, slatsegB[5]);
-    segmentation[0]->Add(id0+11, slatsegB[5]);  
-    segmentation[0]->Add(id0+51, slatsegB[5]);
-    segmentation[0]->Add(id0+61, slatsegB[5]);
+    segmentation[0]->Add(id0+18, slatsegB[5]);
+    segmentation[0]->Add(id0+ 8, slatsegB[5]);  
+    segmentation[0]->Add(id0+21, slatsegB[5]);
+    segmentation[0]->Add(id0+ 5, slatsegB[5]);
 
     // type 330000 
-    segmentation[0]->Add(id0   , slatsegB[6]);
-    segmentation[0]->Add(id0+12, slatsegB[6]);  
-    segmentation[0]->Add(id0+50, slatsegB[6]);
-    segmentation[0]->Add(id0+62, slatsegB[6]);
+    segmentation[0]->Add(id0+19, slatsegB[6]);
+    segmentation[0]->Add(id0+ 7, slatsegB[6]);  
+    segmentation[0]->Add(id0+20, slatsegB[6]);
+    segmentation[0]->Add(id0+ 6, slatsegB[6]);
     fMUON->SetSegmentationModel(chamber, 1, segmentation[0]);   
 
     // cathode 1
     // type 122330
-    segmentation[1]->Add(id0+ 6, slatsegNB[0]);
-    segmentation[1]->Add(id0+56, slatsegNB[0]);
+    segmentation[1]->Add(id0+13, slatsegNB[0]);
+    segmentation[1]->Add(id0   , slatsegNB[0]);
 
     // type 112233
-    segmentation[1]->Add(id0+ 5, slatsegNB[1]);
-    segmentation[1]->Add(id0+ 7, slatsegNB[1]);  
-    segmentation[1]->Add(id0+55, slatsegNB[1]);  
-    segmentation[1]->Add(id0+57, slatsegNB[1]);
+    segmentation[1]->Add(id0+14, slatsegNB[1]);
+    segmentation[1]->Add(id0+12, slatsegNB[1]);  
+    segmentation[1]->Add(id0+25, slatsegNB[1]);  
+    segmentation[1]->Add(id0+ 1, slatsegNB[1]);
   
     // type 112230
-    segmentation[1]->Add(id0+ 4, slatsegNB[2]);
-    segmentation[1]->Add(id0+ 8, slatsegNB[2]);  
-    segmentation[1]->Add(id0+54, slatsegNB[2]);  
-    segmentation[1]->Add(id0+58, slatsegNB[2]);
+    segmentation[1]->Add(id0+15, slatsegNB[2]);
+    segmentation[1]->Add(id0+11, slatsegNB[2]);  
+    segmentation[1]->Add(id0+24, slatsegNB[2]);  
+    segmentation[1]->Add(id0+ 2, slatsegNB[2]);
 
     // type 222330 
+    segmentation[1]->Add(id0+16, slatsegNB[3]);
+    segmentation[1]->Add(id0+10, slatsegNB[3]);  
+    segmentation[1]->Add(id0+23, slatsegNB[3]);
     segmentation[1]->Add(id0+ 3, slatsegNB[3]);
-    segmentation[1]->Add(id0+ 9, slatsegNB[3]);  
-    segmentation[1]->Add(id0+53, slatsegNB[3]);
-    segmentation[1]->Add(id0+59, slatsegNB[3]);
 
     // type 223300 
-    segmentation[1]->Add(id0+ 2, slatsegNB[4]);
-    segmentation[1]->Add(id0+10, slatsegNB[4]);  
-    segmentation[1]->Add(id0+52, slatsegNB[4]);
-    segmentation[1]->Add(id0+60, slatsegNB[4]);
+    segmentation[1]->Add(id0+17, slatsegNB[4]);
+    segmentation[1]->Add(id0+ 9, slatsegNB[4]);  
+    segmentation[1]->Add(id0+22, slatsegNB[4]);
+    segmentation[1]->Add(id0+ 4, slatsegNB[4]);
 
     // type 333000 
-    segmentation[1]->Add(id0+ 1, slatsegNB[5]);
-    segmentation[1]->Add(id0+11, slatsegNB[5]);  
-    segmentation[1]->Add(id0+51, slatsegNB[5]);
-    segmentation[1]->Add(id0+61, slatsegNB[5]);
+    segmentation[1]->Add(id0+18, slatsegNB[5]);
+    segmentation[1]->Add(id0+ 8, slatsegNB[5]);  
+    segmentation[1]->Add(id0+21, slatsegNB[5]);
+    segmentation[1]->Add(id0+ 5, slatsegNB[5]);
 
     // type 330000 
-    segmentation[1]->Add(id0   , slatsegNB[6]);
-    segmentation[1]->Add(id0+12, slatsegNB[6]);  
-    segmentation[1]->Add(id0+50, slatsegNB[6]);
-    segmentation[1]->Add(id0+62, slatsegNB[6]);
+    segmentation[1]->Add(id0+19, slatsegNB[6]);
+    segmentation[1]->Add(id0+ 7, slatsegNB[6]);  
+    segmentation[1]->Add(id0+20, slatsegNB[6]);
+    segmentation[1]->Add(id0+ 6, slatsegNB[6]);
     fMUON->SetSegmentationModel(chamber, 2, segmentation[1]);
 
     fMUON->SetResponseModel(chamber, fResponse0);      
@@ -711,82 +710,82 @@ void AliMUONFactoryV2::BuildStation5()
 
     // cathode 0
     // type 122330
-    segmentation[0]->Add(id0+ 6, slatsegB[0]);
-    segmentation[0]->Add(id0+56, slatsegB[0]);
+    segmentation[0]->Add(id0+13, slatsegB[0]);
+    segmentation[0]->Add(id0   , slatsegB[0]);
   
     // type 112233
-    segmentation[0]->Add(id0+ 4, slatsegB[1]);
-    segmentation[0]->Add(id0+ 5, slatsegB[1]);
-    segmentation[0]->Add(id0+ 7, slatsegB[1]);  
-    segmentation[0]->Add(id0+ 8, slatsegB[1]);  
-    segmentation[0]->Add(id0+54, slatsegB[1]);  
-    segmentation[0]->Add(id0+55, slatsegB[1]);  
-    segmentation[0]->Add(id0+57, slatsegB[1]);
-    segmentation[0]->Add(id0+58, slatsegB[1]);
+    segmentation[0]->Add(id0+15, slatsegB[1]);
+    segmentation[0]->Add(id0+14, slatsegB[1]);
+    segmentation[0]->Add(id0+12, slatsegB[1]);  
+    segmentation[0]->Add(id0+11, slatsegB[1]);  
+    segmentation[0]->Add(id0+24, slatsegB[1]);  
+    segmentation[0]->Add(id0+25, slatsegB[1]);  
+    segmentation[0]->Add(id0+ 1, slatsegB[1]);
+    segmentation[0]->Add(id0+ 2, slatsegB[1]);
 
     // type 333000 
-    segmentation[0]->Add(id0   , slatsegB[2]);
-    segmentation[0]->Add(id0+12, slatsegB[2]);  
-    segmentation[0]->Add(id0+50, slatsegB[2]);
-    segmentation[0]->Add(id0+62, slatsegB[2]);
+    segmentation[0]->Add(id0+19, slatsegB[2]);
+    segmentation[0]->Add(id0+ 7, slatsegB[2]);  
+    segmentation[0]->Add(id0+20, slatsegB[2]);
+    segmentation[0]->Add(id0+ 6, slatsegB[2]);
  
     // type 222333 
+    segmentation[0]->Add(id0+16, slatsegB[3]);
+    segmentation[0]->Add(id0+10, slatsegB[3]);  
+    segmentation[0]->Add(id0+23, slatsegB[3]);
     segmentation[0]->Add(id0+ 3, slatsegB[3]);
-    segmentation[0]->Add(id0+ 9, slatsegB[3]);  
-    segmentation[0]->Add(id0+53, slatsegB[3]);
-    segmentation[0]->Add(id0+59, slatsegB[3]);
  
     // type 223330 
-    segmentation[0]->Add(id0+ 2, slatsegB[4]);
-    segmentation[0]->Add(id0+10, slatsegB[4]);  
-    segmentation[0]->Add(id0+52, slatsegB[4]);
-    segmentation[0]->Add(id0+60, slatsegB[4]);
+    segmentation[0]->Add(id0+17, slatsegB[4]);
+    segmentation[0]->Add(id0+ 9, slatsegB[4]);  
+    segmentation[0]->Add(id0+22, slatsegB[4]);
+    segmentation[0]->Add(id0+ 4, slatsegB[4]);
   
     // type 333300 
-    segmentation[0]->Add(id0+ 1, slatsegB[5]);
-    segmentation[0]->Add(id0+11, slatsegB[5]);  
-    segmentation[0]->Add(id0+51, slatsegB[5]);
-    segmentation[0]->Add(id0+61, slatsegB[5]);
+    segmentation[0]->Add(id0+18, slatsegB[5]);
+    segmentation[0]->Add(id0+ 8, slatsegB[5]);  
+    segmentation[0]->Add(id0+21, slatsegB[5]);
+    segmentation[0]->Add(id0+ 5, slatsegB[5]);
     fMUON->SetSegmentationModel(chamber, 1, segmentation[0]);
 
     // cathode 1
     // type 122330
-    segmentation[1]->Add(id0+ 6, slatsegNB[0]);
-    segmentation[1]->Add(id0+56, slatsegNB[0]);
+    segmentation[1]->Add(id0+13, slatsegNB[0]);
+    segmentation[1]->Add(id0   , slatsegNB[0]);
   
     // type 112233
-    segmentation[1]->Add(id0+ 4, slatsegNB[1]);
-    segmentation[1]->Add(id0+ 5, slatsegNB[1]);
-    segmentation[1]->Add(id0+ 7, slatsegNB[1]);  
-    segmentation[1]->Add(id0+ 8, slatsegNB[1]);  
-    segmentation[1]->Add(id0+54, slatsegNB[1]);  
-    segmentation[1]->Add(id0+55, slatsegNB[1]);  
-    segmentation[1]->Add(id0+57, slatsegNB[1]);
-    segmentation[1]->Add(id0+58, slatsegNB[1]);
+    segmentation[1]->Add(id0+15, slatsegNB[1]);
+    segmentation[1]->Add(id0+14, slatsegNB[1]);
+    segmentation[1]->Add(id0+12, slatsegNB[1]);  
+    segmentation[1]->Add(id0+11, slatsegNB[1]);  
+    segmentation[1]->Add(id0+24, slatsegNB[1]);  
+    segmentation[1]->Add(id0+25, slatsegNB[1]);  
+    segmentation[1]->Add(id0+ 1, slatsegNB[1]);
+    segmentation[1]->Add(id0+ 2, slatsegNB[1]);
 
     // type 333000 
-    segmentation[1]->Add(id0   , slatsegNB[2]);
-    segmentation[1]->Add(id0+12, slatsegNB[2]);  
-    segmentation[1]->Add(id0+50, slatsegNB[2]);
-    segmentation[1]->Add(id0+62, slatsegNB[2]);
+    segmentation[1]->Add(id0+19 , slatsegNB[2]);
+    segmentation[1]->Add(id0+ 7, slatsegNB[2]);  
+    segmentation[1]->Add(id0+20, slatsegNB[2]);
+    segmentation[1]->Add(id0+ 6, slatsegNB[2]);
  
     // type 222333 
+    segmentation[1]->Add(id0+16, slatsegNB[3]);
+    segmentation[1]->Add(id0+10, slatsegNB[3]);  
+    segmentation[1]->Add(id0+23, slatsegNB[3]);
     segmentation[1]->Add(id0+ 3, slatsegNB[3]);
-    segmentation[1]->Add(id0+ 9, slatsegNB[3]);  
-    segmentation[1]->Add(id0+53, slatsegNB[3]);
-    segmentation[1]->Add(id0+59, slatsegNB[3]);
  
     // type 223330 
-    segmentation[1]->Add(id0+ 2, slatsegNB[4]);
-    segmentation[1]->Add(id0+10, slatsegNB[4]);  
-    segmentation[1]->Add(id0+52, slatsegNB[4]);
-    segmentation[1]->Add(id0+60, slatsegNB[4]);
+    segmentation[1]->Add(id0+17, slatsegNB[4]);
+    segmentation[1]->Add(id0+ 9, slatsegNB[4]);  
+    segmentation[1]->Add(id0+22, slatsegNB[4]);
+    segmentation[1]->Add(id0+ 4, slatsegNB[4]);
   
     // type 333300 
-    segmentation[1]->Add(id0+ 1, slatsegNB[5]);
-    segmentation[1]->Add(id0+11, slatsegNB[5]);  
-    segmentation[1]->Add(id0+51, slatsegNB[5]);
-    segmentation[1]->Add(id0+61, slatsegNB[5]);
+    segmentation[1]->Add(id0+18, slatsegNB[5]);
+    segmentation[1]->Add(id0+ 8, slatsegNB[5]);  
+    segmentation[1]->Add(id0+21, slatsegNB[5]);
+    segmentation[1]->Add(id0+ 5, slatsegNB[5]);
     fMUON->SetSegmentationModel(chamber, 2, segmentation[1]);
         
     fMUON->SetResponseModel(chamber, fResponse0);           

diff --git a/MUON/AliMUONHitMapA1.cxx b/MUON/AliMUONHitMapA1.cxx
index 944c299e3003a0cdf04f3b91c49483a9540776ea..428bfc1458282775f6c02c8c73a6cd24f9c609c0 100644 (file)
--- a/MUON/AliMUONHitMapA1.cxx
+++ b/MUON/AliMUONHitMapA1.cxx
@@ -19,7 +19,6 @@
 #include <TMath.h>
 
 #include "AliMUONHitMapA1.h"
-#include "AliSegmentation.h"
 #include "AliMUONGeometrySegmentation.h"
 #include "AliMUONDigit.h"
 #include "AliLog.h"
@@ -37,19 +36,7 @@ AliMUONHitMapA1::AliMUONHitMapA1()
     fHitMap       = 0;
     fDigits       = 0;
 }
-//____________________________________________________________________
-AliMUONHitMapA1::AliMUONHitMapA1(AliSegmentation *seg, TObjArray *dig)
-  : AliHitMap()
-{
-// Constructor
-    fNpx  = seg->Npx()+1;
-    fNpy  = seg->Npy()+1;
-    fMaxIndex=2*(fNpx+1)*2*(fNpy+1)+2*fNpy;
-    
-    fHitMap = new Int_t[fMaxIndex];
-    fDigits =  dig;
-    Clear();
-}
+
 //________________________________________________________________________________
 AliMUONHitMapA1::AliMUONHitMapA1(Int_t idDE, AliMUONGeometrySegmentation* seg, TObjArray* dig)
   : AliHitMap()

diff --git a/MUON/AliMUONHitMapA1.h b/MUON/AliMUONHitMapA1.h
index 34f4e7afab9dd59b847a6b3e564615a1ebf0de5e..08d358fa66061789b4f1786dea999db1b15803eb 100644 (file)
--- a/MUON/AliMUONHitMapA1.h
+++ b/MUON/AliMUONHitMapA1.h
@@ -11,14 +11,12 @@
 
 class TObjArray;
 
-class AliSegmentation;
 class AliMUONGeometrySegmentation;
 
 class AliMUONHitMapA1 : public AliHitMap 
 {
  public:
     AliMUONHitMapA1();
-    AliMUONHitMapA1(AliSegmentation* seg, TObjArray* dig);
     AliMUONHitMapA1(Int_t idDE, AliMUONGeometrySegmentation* seg, TObjArray* dig);
     virtual ~AliMUONHitMapA1();
 

diff --git a/MUON/AliMUONSlatGeometryBuilder.cxx b/MUON/AliMUONSlatGeometryBuilder.cxx
index ad51347020a456161946df8cb3bce1523344babc..3a9f93ec50d0d2b14add411a09e05997f54c4725 100644 (file)
--- a/MUON/AliMUONSlatGeometryBuilder.cxx
+++ b/MUON/AliMUONSlatGeometryBuilder.cxx
@@ -333,53 +333,53 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
        Float_t dzCh3 = dzCh; 
        Float_t zSlat3 = (i%2 ==0)? -zSlat : zSlat; // seems not that zSlat3 = zSlat4 & 5 refering to plan PQ7EN345-6 ?
 
-       sprintf(idSlatCh5,"LA%d",kNslats3-1+i);
+       sprintf(idSlatCh5,"LA%d",i+kNslats3-1);
        gMC->Gsvolu(idSlatCh5,"BOX",kSlatMaterial,spar2,3);
-       detElemId = 500 + i + kNslats3-1;
+       detElemId = 509 - (i + kNslats3-1-4);
        GetEnvelopes(4)->AddEnvelope(idSlatCh5, detElemId, true, TGeoTranslation(xSlat3, ySlat3, -zSlat3 + dzCh3),
                                     TGeoRotation("rot1",90,angle,90,90+angle,0,0) );
 
        sprintf(idSlatCh5,"LA%d",3*kNslats3-2+i);
        gMC->Gsvolu(idSlatCh5,"BOX",kSlatMaterial,spar2,3);
-       detElemId = 550 + i + kNslats3-1;
+       detElemId = 500 + (i + kNslats3-1-4);
        GetEnvelopes(4)->AddEnvelope(idSlatCh5, detElemId, true, TGeoTranslation(-xSlat3, ySlat3, zSlat3 - dzCh3),
                                     TGeoRotation("rot2",90,180+angle,90,90+angle,180,0) );
 
        if (i > 0) { 
          sprintf(idSlatCh5,"LA%d",kNslats3-1-i);
          gMC->Gsvolu(idSlatCh5,"BOX",kSlatMaterial,spar2,3);
-         detElemId = 500 - i + kNslats3-1;
+         detElemId = 509 + (i + kNslats3-1-4);
          GetEnvelopes(4)->AddEnvelope(idSlatCh5, detElemId, true, TGeoTranslation(xSlat3, -ySlat3, -zSlat3 + dzCh3), 
                                       TGeoRotation("rot3",90,angle,90,270+angle,180,0) );
 
          sprintf(idSlatCh5,"LA%d",3*kNslats3-2-i);
          gMC->Gsvolu(idSlatCh5,"BOX",kSlatMaterial,spar2,3);
-         detElemId = 550 - i + kNslats3-1;
+         detElemId = 518 - (i + kNslats3-1-4);
          GetEnvelopes(4)->AddEnvelope(idSlatCh5, detElemId, true, TGeoTranslation(-xSlat3, -ySlat3, zSlat3 - dzCh3),
                                       TGeoRotation("rot4",90,180+angle,90,270+angle,0,0) );
        }
 
        sprintf(idSlatCh6,"LB%d",kNslats3-1+i);  
        gMC->Gsvolu(idSlatCh6,"BOX",kSlatMaterial,spar,3);
-       detElemId = 600 + i  + kNslats3-1;
+       detElemId = 609 - (i  + kNslats3-1-4);
        GetEnvelopes(5)->AddEnvelope(idSlatCh6, detElemId, true, TGeoTranslation(xSlat3, ySlat3, -zSlat3 + dzCh3),
                                     TGeoRotation("rot5",90,angle,90,90+angle,0,0) );
        sprintf(idSlatCh6,"LB%d",3*kNslats3-2+i);
        gMC->Gsvolu(idSlatCh6,"BOX",kSlatMaterial,spar,3);
-       detElemId = 650 + i + kNslats3-1;
+       detElemId = 600 + (i + kNslats3-1-4);
        GetEnvelopes(5)->AddEnvelope(idSlatCh6, detElemId, true, TGeoTranslation(-xSlat3, ySlat3, zSlat3 - dzCh3),
                                     TGeoRotation("rot6",90,180+angle,90,90+angle,180,0) );
 
        if (i > 0) { 
          sprintf(idSlatCh6,"LB%d",kNslats3-1-i);
          gMC->Gsvolu(idSlatCh6,"BOX",kSlatMaterial,spar,3);
-         detElemId = 600 - i + kNslats3-1;
+         detElemId = 609 + (i + kNslats3-1-4);
          GetEnvelopes(5)->AddEnvelope(idSlatCh6, detElemId, true, TGeoTranslation(xSlat3, -ySlat3, -zSlat3 + dzCh3),
                                       TGeoRotation("rot7",90,angle,90,270+angle,180,0) );
 
          sprintf(idSlatCh6,"LB%d",3*kNslats3-2-i);
          gMC->Gsvolu(idSlatCh6,"BOX",kSlatMaterial,spar,3);
-         detElemId = 650 - i + kNslats3-1;
+         detElemId = 618 - (i + kNslats3-1-4);
          GetEnvelopes(5)->AddEnvelope(idSlatCh6, detElemId, true, TGeoTranslation(-xSlat3, -ySlat3, zSlat3 - dzCh3),
                                       TGeoRotation("rot8",90,180+angle,90,270+angle,0,0) );
        }
@@ -696,25 +696,25 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
 
       sprintf(idSlatCh7,"LC%d",kNslats4-1+i);
       gMC->Gsvolu(idSlatCh7,"BOX",kSlatMaterial,spar,3);
-      detElemId = 700 + i + kNslats4-1;
+      detElemId = 713 - (i + kNslats4-1-6);
       GetEnvelopes(6)->AddEnvelope(idSlatCh7, detElemId, true, TGeoTranslation(xSlat4, ySlat41, -zSlat4 + dzCh4),
                                   TGeoRotation("rot1",90,angle,90,90+angle,0,0) );
 
       sprintf(idSlatCh7,"LC%d",3*kNslats4-2+i);
       gMC->Gsvolu(idSlatCh7,"BOX",kSlatMaterial,spar,3);
-      detElemId = 750 + i + kNslats4-1;
+      detElemId = 700 + (i + kNslats4-1-6);
       GetEnvelopes(6)->AddEnvelope(idSlatCh7, detElemId, true, TGeoTranslation(-xSlat4, ySlat41, zSlat4 - dzCh4),
                                   TGeoRotation("rot2",90,180+angle,90,90+angle,180,0) );
  
       if (i > 0) { 
        sprintf(idSlatCh7,"LC%d",kNslats4-1-i);
        gMC->Gsvolu(idSlatCh7,"BOX",kSlatMaterial,spar,3);
-       detElemId = 700 - i + kNslats4-1;
+       detElemId = 713 + (i + kNslats4-1-6);
        GetEnvelopes(6)->AddEnvelope(idSlatCh7, detElemId, true, TGeoTranslation(xSlat4, -ySlat41, -zSlat4 + dzCh4),
                                     TGeoRotation("rot3",90,angle,90,270+angle,180,0) );
 
        sprintf(idSlatCh7,"LC%d",3*kNslats4-2-i);
-       detElemId = 750 - i + kNslats4-1;
+       detElemId = 726 - (i + kNslats4-1-6);
        gMC->Gsvolu(idSlatCh7,"BOX",kSlatMaterial,spar,3);
        GetEnvelopes(6)->AddEnvelope(idSlatCh7, detElemId, true, 
                                     TGeoTranslation(-xSlat4, -ySlat41, zSlat4 - dzCh4),
@@ -723,23 +723,23 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
 
       sprintf(idSlatCh8,"LD%d",kNslats4-1+i);
       gMC->Gsvolu(idSlatCh8,"BOX",kSlatMaterial,spar,3);
-      detElemId = 800 + i + kNslats4-1;
+      detElemId = 813 - (i + kNslats4-1-6);
       GetEnvelopes(7)->AddEnvelope(idSlatCh8, detElemId, true, TGeoTranslation(xSlat4, ySlat42, -zSlat4 + dzCh4),
                                   TGeoRotation("rot5",90,angle,90,90+angle,0,0) );
 
       sprintf(idSlatCh8,"LD%d",3*kNslats4-2+i);
-      detElemId = 850 + i + kNslats4-1;
+      detElemId = 800 + (i + kNslats4-1-6);
       gMC->Gsvolu(idSlatCh8,"BOX",kSlatMaterial,spar,3);
       GetEnvelopes(7)->AddEnvelope(idSlatCh8, detElemId, true, TGeoTranslation(-xSlat4, ySlat42, zSlat4 - dzCh4),
                                   TGeoRotation("rot6",90,180+angle,90,90+angle,180,0) );
       if (i > 0) { 
        sprintf(idSlatCh8,"LD%d",kNslats4-1-i);
-       detElemId = 800 - i + kNslats4-1;
+       detElemId = 813 + (i + kNslats4-1-6);
        gMC->Gsvolu(idSlatCh8,"BOX",kSlatMaterial,spar,3);
        GetEnvelopes(7)->AddEnvelope(idSlatCh8, detElemId, true, TGeoTranslation(xSlat4, -ySlat42, -zSlat4 + dzCh4),
                                     TGeoRotation("rot7",90,angle,90,270+angle,180,0) );
        sprintf(idSlatCh8,"LD%d",3*kNslats4-2-i);
-       detElemId = 850 - i + kNslats4-1;
+       detElemId = 826 - (i + kNslats4-1-6);
        gMC->Gsvolu(idSlatCh8,"BOX",kSlatMaterial,spar,3);
        GetEnvelopes(7)->AddEnvelope(idSlatCh8, detElemId, true, TGeoTranslation(-xSlat4, -ySlat42, zSlat4 - dzCh4),
                                     TGeoRotation("rot8",90,180+angle,90,270+angle,0,0) );
@@ -968,51 +968,51 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
       Float_t zSlat5 = (i%2 ==0)? -zSlat : zSlat; 
 
       sprintf(idSlatCh9,"LE%d",kNslats5-1+i);
-      detElemId = 900 + i + kNslats5-1;
+      detElemId = 913 - (i + kNslats5-1-6);
       gMC->Gsvolu(idSlatCh9,"BOX",kSlatMaterial,spar,3);
       GetEnvelopes(8)->AddEnvelope(idSlatCh9, detElemId, true, TGeoTranslation(xSlat5, ySlat5, -zSlat5 + dzCh5),
                                   TGeoRotation("rot1",90,angle,90,90+angle,0,0) );
 
       sprintf(idSlatCh9,"LE%d",3*kNslats5-2+i);
-      detElemId = 950 + i + kNslats5-1;
+      detElemId = 900 + (i + kNslats5-1-6);
       gMC->Gsvolu(idSlatCh9,"BOX",kSlatMaterial,spar,3);
       GetEnvelopes(8)->AddEnvelope(idSlatCh9, detElemId, true, TGeoTranslation(-xSlat5, ySlat5, zSlat5 - dzCh5),
                                   TGeoRotation("rot2",90,180+angle,90,90+angle,180,0) );
  
       if (i > 0) { 
        sprintf(idSlatCh9,"LE%d",kNslats5-1-i);
-       detElemId = 900 - i + kNslats5-1;
+       detElemId = 913 + (i + kNslats5-1-6);
        gMC->Gsvolu(idSlatCh9,"BOX",kSlatMaterial,spar,3);
        GetEnvelopes(8)->AddEnvelope(idSlatCh9, detElemId, true, TGeoTranslation(xSlat5, -ySlat5, -zSlat5 + dzCh5),
                                     TGeoRotation("rot3",90,angle,90,270+angle,180,0) );
 
        sprintf(idSlatCh9,"LE%d",3*kNslats5-2-i);
-       detElemId = 950 - i + kNslats5-1;
+       detElemId = 926 - (i + kNslats5-1-6);
        gMC->Gsvolu(idSlatCh9,"BOX",kSlatMaterial,spar,3);
        GetEnvelopes(8)->AddEnvelope(idSlatCh9, detElemId, true, TGeoTranslation(-xSlat5, -ySlat5, zSlat5 - dzCh5),
                                     TGeoRotation("rot4",90,180+angle,90,270+angle,0,0)  );
       }
 
       sprintf(idSlatCh10,"LF%d",kNslats5-1+i);
-      detElemId = 1000 + i + kNslats5-1;
+      detElemId = 1013 - (i + kNslats5-1-6);
       gMC->Gsvolu(idSlatCh10,"BOX",kSlatMaterial,spar,3);
       GetEnvelopes(9)->AddEnvelope(idSlatCh10, detElemId, true, TGeoTranslation(xSlat5, ySlat5, -zSlat5 + dzCh5),
                                   TGeoRotation("rot5",90,angle,90,90+angle,0,0) );
 
       sprintf(idSlatCh10,"LF%d",3*kNslats5-2+i);
-      detElemId = 1050 + i + kNslats5-1;
+      detElemId = 1000 + (i + kNslats5-1-6);
       gMC->Gsvolu(idSlatCh10,"BOX",kSlatMaterial,spar,3);
       GetEnvelopes(9)->AddEnvelope(idSlatCh10, detElemId, true, TGeoTranslation(-xSlat5, ySlat5, zSlat5 - dzCh5),
                                   TGeoRotation("rot6",90,180+angle,90,90+angle,180,0) );
 
       if (i > 0) { 
        sprintf(idSlatCh10,"LF%d",kNslats5-1-i);
-       detElemId = 1000 - i + kNslats5-1;
+       detElemId = 1013 + (i + kNslats5-1-6);
        gMC->Gsvolu(idSlatCh10,"BOX",kSlatMaterial,spar,3);
        GetEnvelopes(9)->AddEnvelope(idSlatCh10, detElemId, true, TGeoTranslation(xSlat5, -ySlat5, -zSlat5 + dzCh5),
                                     TGeoRotation("rot7",90,angle,90,270+angle,180,0) );
        sprintf(idSlatCh10,"LF%d",3*kNslats5-2-i);
-       detElemId = 1050 - i + kNslats5-1;
+       detElemId = 1026 - (i + kNslats5-1-6);
        gMC->Gsvolu(idSlatCh10,"BOX",kSlatMaterial,spar,3);
        GetEnvelopes(9)->AddEnvelope(idSlatCh10, detElemId, true, TGeoTranslation(-xSlat5, -ySlat5, zSlat5 - dzCh5),
                                     TGeoRotation("rot8",90,180+angle,90,270+angle,0,0) );