added pdet-ppart over ppart histogram for detector response

[u/mrichter/AliRoot.git] / MUON / AliMUONDigitizerV3.cxx

diff --git a/MUON/AliMUONDigitizerV3.cxx b/MUON/AliMUONDigitizerV3.cxx
index c50c32533fc1c3a6a2626b5662f0274d5886f578..91fb1e8d2cd0edc6de9c2cbc9333a981b369f8bd 100644 (file)
--- a/MUON/AliMUONDigitizerV3.cxx
+++ b/MUON/AliMUONDigitizerV3.cxx
@@ -118,7 +118,7 @@ fCalibrationData(0x0),
 fTriggerProcessor(0x0),
 fNoiseFunctionTrig(0x0),
 fGenerateNoisyDigits(generateNoisyDigits),
-fLogger(new AliMUONLogger(1000)),
+fLogger(new AliMUONLogger(4207)), /* 4207 = 25% of the 16828 MCH manus */
 fTriggerStore(new AliMUONTriggerStoreV1),
 fDigitStore(0x0),
 fOutputDigitStore(0x0),
@@ -243,6 +243,17 @@ AliMUONDigitizerV3::ApplyResponseToTriggerDigit(AliMUONVDigit& digit)
   Int_t cathode = digit.Cathode();
   Int_t trigCh = detElemId/100 - 11;
   
+  // Masked channels
+  Bool_t isMasked = fTriggerUtilities->IsMasked(digit);
+  AliDebug(1,Form("detElemId %i  cath %i  board %i  strip %i  is masked %i\n", detElemId, cathode, localCircuit, strip, isMasked));
+  if ( isMasked ) {
+    digit.SetCharge(0);
+    digit.SetADC(0);
+    //AliDebug(1,Form("ch %i  cath %i  board %i  strip %i  masked\n", trigCh, cathode, localCircuit, strip));
+    return;
+  }
+  
+  
   Int_t arrayIndex = GetArrayIndex(cathode, trigCh, localCircuit);
   
   // Trigger chamber efficiency
@@ -255,24 +266,14 @@ AliMUONDigitizerV3::ApplyResponseToTriggerDigit(AliMUONVDigit& digit)
       fEfficiencyResponse[arrayIndexBend] = isTrig[0];
       fEfficiencyResponse[arrayIndexNonBend] = isTrig[1];
     }
-    AliDebug(1,Form("ch %i  cath %i  board %i  strip %i  efficiency %i\n", trigCh, cathode, localCircuit, strip, fEfficiencyResponse[arrayIndex]));
+    AliDebug(1,Form("detElemId %i  cath %i  board %i  strip %i  efficiency %i\n", detElemId, cathode, localCircuit, strip, fEfficiencyResponse[arrayIndex]));
     if ( fEfficiencyResponse[arrayIndex] == 0 ) {
       digit.SetCharge(0);
       digit.SetADC(0);
       //AliDebug(1,Form("ch %i  cath %i  board %i  strip %i  NOT efficient\n", trigCh, cathode, localCircuit, strip));
       return;
     }
-  }
-  
-  // Masked channels
-  Bool_t isMasked = fTriggerUtilities->IsMasked(digit);
-  AliDebug(1,Form("ch %i  cath %i  board %i  strip %i  mask %i\n", trigCh, cathode, localCircuit, strip, !isMasked));
-  if ( isMasked ) {
-    digit.SetCharge(0);
-    digit.SetADC(0);
-    //AliDebug(1,Form("ch %i  cath %i  board %i  strip %i  masked\n", trigCh, cathode, localCircuit, strip));
-    return;
-  }
+  }  
 }
 
 
@@ -361,7 +362,7 @@ AliMUONDigitizerV3::DecalibrateTrackerDigit(const AliMUONVCalibParam& pedestals,
   Float_t pedestalMean = pedestals.ValueAsFloat(channel,0);
   Float_t pedestalSigma = pedestals.ValueAsFloat(channel,1);
   
-  AliDebugClass(1,Form("DE %04d MANU %04d CH %02d PEDMEAN %7.2f PEDSIGMA %7.2f",
+  AliDebugClass(2,Form("DE %04d MANU %04d CH %02d PEDMEAN %7.2f PEDSIGMA %7.2f",
                       pedestals.ID0(),pedestals.ID1(),channel,pedestalMean,pedestalSigma));
   
   if ( qual <= 0 ) return 0;