Minor improvements on the code
authorvicinanz <vicinanz@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 2 Oct 2001 13:03:13 +0000 (13:03 +0000)
committervicinanz <vicinanz@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 2 Oct 2001 13:03:13 +0000 (13:03 +0000)
TOF/AliTOF.cxx
TOF/AliTOFSDigitizer.cxx

index 059b21ccd9d43fc5d866388e2414fb014b73cd74..56c34e4618bf80067f03c1a0783e47fd4fb4c645 100644 (file)
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.26  2001/09/27 10:39:20  vicinanz
+SDigitizer and Merger added
+
 Revision 1.25  2001/09/07 08:37:40  hristov
 Pointers initialised to 0 in the default constructor
 
@@ -863,14 +866,12 @@ Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track)
 // This procedure has to be optimized in the next TOF release.
 //
 
-//        Bool_t overlap = 0;
         Bool_t overlap = kFALSE;
         Int_t  vol2[5];
 
         for (Int_t ndig=0; ndig<fSDigits->GetEntries(); ndig++){
           AliTOFdigit* currentDigit = (AliTOFdigit*)(fSDigits->UncheckedAt(ndig));
            currentDigit->GetLocation(vol2);
-//           Bool_t idem=1;
            Bool_t idem= kTRUE;
           // check on digit volume
            for (Int_t i=0;i<=4;i++){
@@ -896,11 +897,10 @@ Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track)
                   currentDigit->SetAdc(digit[1]);
                  }
                   currentDigit->AddTrack(Track); // add track number in the track array
-//               cout << "found overlap" << endl;
-//                  overlap = 1;
                   overlap = kTRUE;
-
-              } // if (TMath:: ...)
+                 return overlap;
+              } else 
+               overlap= kFALSE;
 
            } // close if (idem) -> two digits on the same TOF pad
 
index 94a8a6b38c4ad96ae62701ec08ebb44ad58847df..bcea3d05e4d9622ada59edf89fe4aeb48e63ed4d 100644 (file)
@@ -168,7 +168,7 @@ void AliTOFSDigitizer::Exec(Option_t *option) {
                if(!overlap) 
                  //                    new ((*fSDigits)[nSdigits++]) AliTOFdigit(tracks, vol, digit);
                  TOF->AddSDigit(tracks, vol, digit);
-               cout << "nSdigits" << endl; 
+//             printf("Sect. %d, Plate %d, PadX %d, PadZ %d, Strip %d, Tdc %f",vol[0],vol[1],vol[2],vol[3],vol[5],digit[0]);
                } // end loop on hits for the current track
 
             } // end loop on ntracks