Bug in QA class corrected

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

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index 3306704f8514fa884331fded4bb90fdbf4afea8e..012376dfad493e84983f0bf6af1ff42f15c53c13 100644 (file)
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -376,10 +376,13 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
              trackno=tracknoOld;
              
              //-----------------end of modification----------------
+             Float_t ptime = fPMDHit->GetTime()*1e6;   // time in microsec
+             if (ptime < 0. || ptime > 1.2) continue;  
+
              xPos = fPMDHit->X();
              yPos = fPMDHit->Y();
              zPos = fPMDHit->Z();
-             
+
              edep       = fPMDHit->GetEnergy();
              Int_t vol1 = fPMDHit->GetVolume(1); // Column
              Int_t vol2 = fPMDHit->GetVolume(2); // Row
@@ -416,16 +419,16 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
                }
 
              AliDebug(2,Form("Zposition = %f Edeposition = %f",zPos,edep));
-             //Float_t zposition = TMath::Abs(zPos);
-             if (zPos < fZPos)
+
+             if (vol7 < 24)
                {
-                 // CPV
-                 fDetNo = 1;
+                 // PRE
+                 fDetNo = 0;
                }
-             else if (zPos > fZPos)
+             else
                {
-                 // PMD
-                 fDetNo = 0;
+                 // CPV
+                 fDetNo = 1;
                }
 
              Int_t smn = smnumber;
@@ -621,6 +624,9 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
              mtrackno=trackno;
              trackpid=trackpidOld;
              trackno=tracknoOld;
+
+             Float_t ptime = fPMDHit->GetTime()*1e6;
+             if (ptime < 0. || ptime > 1.2) continue;
              
              xPos = fPMDHit->X();
              yPos = fPMDHit->Y();
@@ -661,17 +667,27 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
 
              AliDebug(2,Form("ZPosition = %f Edeposition = %d",zPos,edep));
 
-             if (zPos < fZPos)
+             if (vol7 < 24)
+               {
+                 // PRE
+                 fDetNo = 0;
+               }
+             else
                {
-                 // CPV
                  fDetNo = 1;
                }
-             else if (zPos > fZPos)
+             /*
+               if (zPos < fZPos)
                {
-                 // PMD
-                 fDetNo = 0;
+               // CPV
+               fDetNo = 1;
                }
-
+               else if (zPos > fZPos)
+               {
+               // PMD
+               fDetNo = 0;
+               }
+             */
              Int_t smn = smnumber;
              Int_t ixx = xpad     - 1;
              Int_t iyy = ypad     - 1;