Define constant MAXTRACKS for maximum number of tracks associated with 1 digit

diff --git a/MUON/AliMUONDigit.cxx b/MUON/AliMUONDigit.cxx
index 7f2ee3cc4572f101667a59068b1a3591f2a97017..8b30a9737d94d87ffcde557103f1a380584dff39 100644 (file)
--- a/MUON/AliMUONDigit.cxx
+++ b/MUON/AliMUONDigit.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  2001/01/26 21:26:58  morsch
+All data members private. Access functions provided.
+
 Revision 1.2  2000/06/15 07:58:48  morsch
 Code from MUON-dev joined
 
@@ -53,7 +56,7 @@ AliMUONDigit::AliMUONDigit(Int_t *tracks, Int_t *charges, Int_t *digits)
     fPhysics     = digits[4];
     fHit         = digits[5];
 
-    for(Int_t i=0; i<10; i++) {
+    for(Int_t i=0; i<MAXTRACKS; i++) {
        fTcharges[i]  = charges[i];
        fTracks[i]    = tracks[i];
     }

diff --git a/MUON/AliMUONDigit.h b/MUON/AliMUONDigit.h
index 30a450b3ea5008969fe8ff5651025756d844d3c1..e840febee84a850a2e8dd5984f2202b19deef04e 100644 (file)
--- a/MUON/AliMUONDigit.h
+++ b/MUON/AliMUONDigit.h
@@ -7,6 +7,8 @@
 
 #include <TObject.h>
 
+#define MAXTRACKS 10
+
 class AliMUONDigit : public TObject {
 
  public:
@@ -31,8 +33,8 @@ class AliMUONDigit : public TObject {
     Int_t     fCathode;       // Cathode number
     
     Int_t     fSignal;        // Signal amplitude
-    Int_t     fTcharges[10];  // charge per track making this digit (up to 10)
-    Int_t     fTracks[10];    // primary tracks making this digit (up to 10)
+    Int_t     fTcharges[MAXTRACKS];  // charge per track making this digit (up to 10)
+    Int_t     fTracks[MAXTRACKS];    // primary tracks making this digit (up to 10)
     Int_t     fPhysics;       // physics contribution to signal 
     Int_t     fHit;           // hit number - temporary solution
 

diff --git a/MUON/AliMUONDigitizer.cxx b/MUON/AliMUONDigitizer.cxx
index 0cb7e0a6ab14a0ccb58a416fe0909e2a06bc64d9..78f144c26b5749429b7aba76e7d81b3203e39762 100644 (file)
--- a/MUON/AliMUONDigitizer.cxx
+++ b/MUON/AliMUONDigitizer.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  2001/10/04 20:01:54  jchudoba
+changes for TTask implementation, some other small editing
+
 Revision 1.2  2001/07/28 10:46:04  hristov
 AliRunDigitizer.h included; typos corrected
 
@@ -22,7 +25,6 @@ Revision 1.1  2001/07/27 15:41:01  jchudoba
 merging/digitization classes
 
 */
-
 #include <TTree.h> 
 #include <TVector.h>
 #include <TObjArray.h>
@@ -319,8 +321,8 @@ void AliMUONDigitizer::Exec(Option_t* option)
     } // end file loop
     if (GetDebug()>2) cerr<<"END OF FILE LOOP"<<endl;
 
-    Int_t tracks[10];
-    Int_t charges[10];
+    Int_t tracks[MAXTRACKS];
+    Int_t charges[MAXTRACKS];
     Int_t nentries = fTDList->GetEntriesFast();
        
     for (Int_t nent = 0; nent < nentries; nent++) {
@@ -348,12 +350,15 @@ void AliMUONDigitizer::Exec(Option_t* option)
 
       // this was changed to accomodate the real number of tracks
 
-      if (nptracks > 10 && GetDebug() >0) {
-       cerr<<"Attention - nptracks > 10 "<<nptracks<<endl;
-       nptracks = 10;
+      if (nptracks > MAXTRACKS) {
+       if (GetDebug() >0) {
+         cerr<<"AliMUONDigitizer: nptracks > 10 "<<nptracks;
+         cerr<<"reset to max value "<<MAXTRACKS<<endl;
+       }
+       nptracks = MAXTRACKS;
       }
       if (nptracks > 2 && GetDebug() >2) {
-       cerr<<"Attention - nptracks > 2 "<<nptracks<<endl;
+       cerr<<"AliMUONDigitizer: nptracks > 2 "<<nptracks<<endl;
        printf("cat,ich,ix,iy,q %d %d %d %d %d \n",icat,ich,fDigits[0],fDigits[1],q);
       }
       for (Int_t tr = 0; tr < nptracks; tr++) {
@@ -370,8 +375,8 @@ void AliMUONDigitizer::Exec(Option_t* option)
       if (nptracks > 1) {
        SortTracks(tracks,charges,nptracks);
       }
-      if (nptracks < 10 ) {
-       for (Int_t i = nptracks; i < 10; i++) {
+      if (nptracks < MAXTRACKS ) {
+       for (Int_t i = nptracks; i < MAXTRACKS; i++) {
          tracks[i]  = 0;
          charges[i] = 0;
        }