Minor changes

[u/mrichter/AliRoot.git] / TOF / AliTOFSDigitizer.cxx

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index 910b55d0aa5b7c9bc8480fd170727768aab6918c..dab096a05633d2e158b44bb5aae35c5ee153894f 100644 (file)
--- a/TOF/AliTOFSDigitizer.cxx
+++ b/TOF/AliTOFSDigitizer.cxx
@@ -407,7 +407,7 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
     Int_t ntracks = static_cast<Int_t>(hitTree->GetEntries());
     for (Int_t track = 0; track < ntracks; track++)
     {
-      gAlice->ResetHits();
+      gAlice->GetMCApp()->ResetHits();
       tofHitsBranch->GetEvent(track);
 
       AliMC *mcApplication = (AliMC*)gAlice->GetMCApp();
@@ -459,7 +459,13 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
        }
        
        geantTime *= 1.e+09;  // conversion from [s] to [ns]
-       
+       // TOF matching window (~200ns) control
+       if (geantTime>=AliTOFGeometry::MatchingWindow()*1E-3) {
+         AliDebug(2,Form("Time measurement (%f) greater than the matching window (%f)",
+                         geantTime, AliTOFGeometry::MatchingWindow()*1E-3));
+         continue;
+       }
+
        // selection case for sdigitizing only hits in a given plate of a given sector
        if(thereIsNotASelection || (vol[0]==fSelectedSector && vol[1]==fSelectedPlate)){
          
@@ -497,8 +503,15 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
              for(Int_t indexOfPad=0; indexOfPad<nActivatedPads; indexOfPad++) {
                if(isFired[indexOfPad]){ // the pad has fired
                  Float_t timediff=geantTime-tofAfterSimul[indexOfPad];
-                 
-                 if(timediff>=0.2) nlargeTofDiff++;
+
+                 // TOF matching window (~200ns) control
+                 if (tofAfterSimul[indexOfPad]>=AliTOFGeometry::MatchingWindow()*1E-3) {
+                   AliDebug(2,Form("Time measurement (%f) greater than the matching window (%f)",
+                                   tofAfterSimul[indexOfPad], AliTOFGeometry::MatchingWindow()*1E-3));
+                   continue;
+                 }
+
+                 if(timediff>=0.2) nlargeTofDiff++; // greater than 200ps
                  
                  digit[0] = (Int_t) ((tofAfterSimul[indexOfPad]*1.e+03)/AliTOFGeometry::TdcBinWidth()); // TDC bin number (each bin -> 24.4 ps)
                  
@@ -550,15 +563,14 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
     
     if (tof->SDigits()) tof->ResetSDigits();
     
-    if (strstr(verboseOption,"all")) {
-      AliInfo("----------------------------------------");
-      AliInfo("       <AliTOFSDigitizer>    ");
-      AliInfo(Form("After sdigitizing %d hits in event %d", nselectedHitsinEv, iEvent));
+    if (strstr(verboseOption,"all") || strstr(verboseOption,"partial")) {
+      AliDebug(2,"----------------------------------------");
+      AliDebug(2,Form("After sdigitizing %d hits in event %d", nselectedHitsinEv, iEvent));
       //" (" << nHitsFromPrim << " from primaries and " << nHitsFromSec << " from secondaries) TOF hits, " 
-      AliInfo(Form("%d digits have been created", ntotalsdigitsinEv));
-      AliInfo(Form("(%d due to signals and %d due to border effect)", nsignalsdigitsinEv, nnoisesdigitsinEv));
-      AliInfo(Form("%d total updates of the hit map have been performed in current event", ntotalupdatesinEv));
-      AliInfo("----------------------------------------");
+      AliInfo(Form("%d sdigits have been created", ntotalsdigitsinEv));
+      AliDebug(2,Form("(%d due to signals and %d due to border effect)", nsignalsdigitsinEv, nnoisesdigitsinEv));
+      AliDebug(2,Form("%d total updates of the hit map have been performed in current event", ntotalupdatesinEv));
+      AliDebug(2,"----------------------------------------");
     }
 
   } //event loop on events
@@ -575,19 +587,15 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
   }
   
   nHitsFromSec=nselectedHits-nHitsFromPrim;
-  if(strstr(verboseOption,"all")){
-    AliInfo("----------------------------------------");
-    AliInfo("----------------------------------------");
-    AliInfo("-----------SDigitization Summary--------");
-    AliInfo("       <AliTOFSDigitizer>     ");
-    AliInfo(Form("After sdigitizing %d hits", nselectedHits));
-    AliInfo(Form("in %d events", fEvent2-fEvent1));
-//" (" << nHitsFromPrim << " from primaries and " << nHitsFromSec << " from secondaries) TOF hits, " 
-    AliInfo(Form("%d sdigits have been created", ntotalsdigits));
-    AliInfo(Form("(%d due to signals and " 
-                "%d due to border effect)", nsignalsdigits, nnoisesdigits));
-    AliInfo(Form("%d total updates of the hit map have been performed", ntotalupdates));
-    AliInfo(Form("in %d cases the time of flight difference is greater than 200 ps", nlargeTofDiff));
+  if (strstr(verboseOption,"all") || strstr(verboseOption,"partial")) {
+    AliDebug(2,"----------------------------------------");
+    AliDebug(2,Form("After sdigitizing %d hits in %d events ", nselectedHits, fEvent2-fEvent1));
+    //" (" << nHitsFromPrim << " from primaries and " << nHitsFromSec << " from secondaries) TOF hits, " 
+    AliDebug(2,Form("%d sdigits have been created", ntotalsdigits));
+    AliDebug(2,Form("(%d due to signals and %d due to border effect)", nsignalsdigits, nnoisesdigits));
+    AliDebug(2,Form("%d total updates of the hit map have been performed", ntotalupdates));
+    AliDebug(2,Form("in %d cases the time of flight difference is greater than 200 ps", nlargeTofDiff));
+    AliDebug(2,"----------------------------------------");
   }