cables and girders, modular geometry easy to turn off

[u/mrichter/AliRoot.git] / PMD / AliPMDDigitizer.cxx

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index 2c5eb066c5f32af966a7f585ad3cabc3ff945793..ff7143d2f3e9e349f1914758d07e6b316bc3cf59 100644 (file)
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -365,8 +365,7 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
              edep       = fPMDHit->GetEnergy();
              Int_t vol1 = fPMDHit->GetVolume(1); // Column
              Int_t vol2 = fPMDHit->GetVolume(2); // Row
-             Int_t vol7 = fPMDHit->GetVolume(7); // UnitModule
-             Int_t vol8 = fPMDHit->GetVolume(8); // SuperModule
+             Int_t vol7 = fPMDHit->GetVolume(4); // Serial Module No
 
 
              // -----------------------------------------//
@@ -377,9 +376,15 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
              //  nrow = 96, ncol = 48                    //
              // -----------------------------------------//
 
-
-             
-             smnumber = (vol8-1)*6 + vol7;
+             if (vol7 < 24)
+               {
+                 smnumber = vol7;
+               }
+             else
+               {
+                 smnumber = vol7 - 24;
+               }
+             Int_t vol8 = smnumber/6 + 1;   // fake supermodule
 
              if (vol8 == 1 || vol8 == 2)
                {
@@ -404,7 +409,8 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
                  // PMD
                  fDetNo = 0;
                }
-             Int_t smn = smnumber - 1;
+             //Int_t smn = smnumber - 1;
+             Int_t smn = smnumber;
              Int_t ixx = xpad     - 1;
              Int_t iyy = ypad     - 1;
              if (fDetNo == 0)
@@ -590,9 +596,7 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
              edep       = fPMDHit->GetEnergy();
              Int_t vol1 = fPMDHit->GetVolume(1); // Column
              Int_t vol2 = fPMDHit->GetVolume(2); // Row
-             Int_t vol7 = fPMDHit->GetVolume(7); // UnitModule
-             Int_t vol8 = fPMDHit->GetVolume(8); // SuperModule
-
+             Int_t vol7 = fPMDHit->GetVolume(4); // Serial Module No
 
              // -----------------------------------------//
              // In new geometry after adding electronics //
@@ -602,7 +606,15 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
              //  nrow = 96, ncol = 48                    //
              // -----------------------------------------//
              
-             smnumber = (vol8-1)*6 + vol7;
+             if (vol7 < 24)
+               {
+                 smnumber = vol7;
+               }
+             else
+               {
+                 smnumber = vol7 - 24;
+               }
+             Int_t vol8 = smnumber/6 + 1;    // fake supermodule
 
              if (vol8 == 1 || vol8 == 2)
                {
@@ -629,7 +641,8 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
                  fDetNo = 0;
                }
 
-             Int_t smn = smnumber - 1;
+             //Int_t smn = smnumber - 1;
+             Int_t smn = smnumber;
              Int_t ixx = xpad     - 1;
              Int_t iyy = ypad     - 1;
              if (fDetNo == 0)