Removing centrality check from default:

[u/mrichter/AliRoot.git] / TRD / AliTRDmcmSim.cxx

diff --git a/TRD/AliTRDmcmSim.cxx b/TRD/AliTRDmcmSim.cxx
index 43d9f7179e4114ea6f507ce4621b7629b75361f0..d6536c4ac4f94ec3172d54befc1dd1f09e04827d 100644 (file)
--- a/TRD/AliTRDmcmSim.cxx
+++ b/TRD/AliTRDmcmSim.cxx
@@ -49,6 +49,7 @@
 #include "AliTRDarrayDictionary.h"
 #include "AliTRDtrackletMCM.h"
 #include "AliTRDmcmSim.h"
+#include "TTreeStream.h"
 
 ClassImp(AliTRDmcmSim)
 
@@ -84,7 +85,8 @@ AliTRDmcmSim::AliTRDmcmSim() :
   fTailAmplLong(NULL),
   fTailAmplShort(NULL),
   fNHits(0),
-  fFitReg(NULL)
+  fFitReg(NULL),
+  fDebugStream(0x0)
 {
   //
   // AliTRDmcmSim default constructor
@@ -1113,9 +1115,9 @@ void AliTRDmcmSim::ZSMapping()
     // ----- first channel -----
     iAdc = 0;
 
-    ap = 0;               // previous
-    ac = adc[iAdc  ][it]; // current
-    an = adc[iAdc+1][it]; // next
+    ap = 0 >> fgkAddDigits;               // previous
+    ac = adc[iAdc  ][it] >> fgkAddDigits; // current
+    an = adc[iAdc+1][it] >> fgkAddDigits; // next
 
     mask  = ( ac >=  ap && ac >=  an ) ? 0 : 0x1; // peak center detection
     mask += ( ap + ac + an > eBIT )    ? 0 : 0x2; // cluster
@@ -1131,9 +1133,9 @@ void AliTRDmcmSim::ZSMapping()
     // ----- last channel -----
     iAdc = AliTRDfeeParam::GetNadcMcm() - 1;
 
-    ap = adc[iAdc-1][it]; // previous
-    ac = adc[iAdc  ][it]; // current
-    an = 0;               // next
+    ap = adc[iAdc-1][it] >> fgkAddDigits; // previous
+    ac = adc[iAdc  ][it] >> fgkAddDigits; // current
+    an = 0 >> fgkAddDigits;               // next
 
     mask  = ( ac >=  ap && ac >=  an ) ? 0 : 0x1; // peak center detection
     mask += ( ap + ac + an > eBIT )    ? 0 : 0x2; // cluster
@@ -1148,9 +1150,9 @@ void AliTRDmcmSim::ZSMapping()
 
     // ----- middle channels -----
     for( iAdc = 1 ; iAdc < AliTRDfeeParam::GetNadcMcm()-1; iAdc++ ) {
-      ap = adc[iAdc-1][it]; // previous
-      ac = adc[iAdc  ][it]; // current
-      an = adc[iAdc+1][it]; // next
+      ap = adc[iAdc-1][it] >> fgkAddDigits; // previous
+      ac = adc[iAdc  ][it] >> fgkAddDigits; // current
+      an = adc[iAdc+1][it] >> fgkAddDigits; // next
 
       mask  = ( ac >=  ap && ac >=  an ) ? 0 : 0x1; // peak center detection
       mask += ( ap + ac + an > eBIT )    ? 0 : 0x2; // cluster
@@ -1290,6 +1292,14 @@ void AliTRDmcmSim::CalcFitreg()
 
         // The accumulated charge is with the pedestal!!!
         qtotTemp = adcLeft + adcCentral + adcRight;
+       if ((fDebugStream) && (qtotTemp > 130)) {
+         (*fDebugStream) << "testtree"
+                         << "qtot=" << qtotTemp
+                         << "qleft=" << adcLeft
+                         << "qcent=" << adcCentral
+                         << "qright=" << adcRight
+                         << "\n";
+       }
         if ( (hitQual) &&
              (qtotTemp >= fTrapConfig->GetTrapReg(AliTRDtrapConfig::kTPHT, fDetector, fRobPos, fMcmPos)) &&
              (adcLeft <= adcCentral) &&