Connect only MUON branches when reading the event to speed up digitisation.

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 5e79f84e968aa562cd0bc71543bd3eea6f71e8b0..8412185b70411f172ee75784c145a52597e803dd 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  2001/03/16 15:32:06  morsch
+Corrections of overlap with beam shield and dipole (A. de Falco)
+
 Revision 1.7  2001/03/14 17:22:15  pcrochet
 Geometry of the trigger chambers : a vertical gap of has been introduced around x=0 according fig.3.27 of the TDR (P.Dupieux)
 
@@ -46,7 +49,7 @@ Add class AliMUONConstants with MUON specific constants using static memeber dat
 
 ClassImp(AliMUONConstants)
 
-Int_t   AliMUONConstants::fgNCh = 14;
+const Int_t   AliMUONConstants::fgNCh = 14;
 Int_t   AliMUONConstants::fgNTrackingCh = 10;
 Int_t   AliMUONConstants::fgNTriggerCh = 4;
 Int_t   AliMUONConstants::fgNTriggerCircuit = 234;

diff --git a/MUON/AliMUONConstants.h b/MUON/AliMUONConstants.h
index 053256caf4c023e3f623782f3b9d04e9e92ebac4..068699ca974cef6f477642d985ef40c12cbadd1a 100644 (file)
--- a/MUON/AliMUONConstants.h
+++ b/MUON/AliMUONConstants.h
@@ -3,7 +3,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/*$Id $*/
+/*$Id$*/
 
 #include <TObject.h>
 
@@ -31,7 +31,7 @@ class AliMUONConstants : public TObject {
     AliMUONConstants(){}
     virtual ~AliMUONConstants(){}
  private:
-    static Int_t  fgNCh;                //  Number of Chambers    
+    static const Int_t  fgNCh;                //  Number of Chambers    
     static Int_t  fgNTrackingCh;        //  Number of Tracking Chambers
     static Int_t  fgNTriggerCh;         //  Number of Trigger Chambers
     static Int_t  fgNTriggerCircuit;    //  Number of Trigger Circuits

diff --git a/MUON/AliMUONDigit.cxx b/MUON/AliMUONDigit.cxx
index 633b79648f50a4ff76b3480146cafedf8d25624f..c08778727c2945c441b6a118f340d22f252f2945 100644 (file)
--- a/MUON/AliMUONDigit.cxx
+++ b/MUON/AliMUONDigit.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.5  2001/10/31 16:40:07  jchudoba
+change preprocessor constant to C++ constant
+
 Revision 1.4  2001/10/18 14:44:09  jchudoba
 Define constant MAXTRACKS for maximum number of tracks associated with 1 digit
 
@@ -31,6 +34,8 @@ Was before in DataStructures.cxx
 
 #include "AliMUONDigit.h"
 
+#include <iostream.h>
+
 ClassImp(AliMUONDigit)
 //_____________________________________________________________________________
 AliMUONDigit::AliMUONDigit(Int_t *digits)
@@ -69,3 +74,14 @@ AliMUONDigit::~AliMUONDigit()
 {
     // Destructor 
 }
+
+////////////////////////////////////////////////////////////////////////
+void AliMUONDigit::Print(Option_t *option) const 
+{
+  // print
+  cout<<"fPadX, fPadY, fCathode, fSignal, fPhysics, fHit: \n";
+  cout<<"   "<<fPadX<<" "<<fPadY<<" "<<fCathode<<" "
+      <<fSignal<<" "<<fPhysics<<" "<<fHit<<endl;
+}
+
+////////////////////////////////////////////////////////////////////////

diff --git a/MUON/AliMUONDigit.h b/MUON/AliMUONDigit.h
index a0331c5677ef192be64ed6dcf6cb59acfb180545..862ae463a0e694c84363ad6ca4ba29d0a9dac921 100644 (file)
--- a/MUON/AliMUONDigit.h
+++ b/MUON/AliMUONDigit.h
@@ -27,7 +27,8 @@ class AliMUONDigit : public TObject {
     virtual Int_t    TrackCharge(Int_t i) const {return fTcharges[i];}    
     virtual void     AddSignal(Int_t q)   {fSignal += q;}
     virtual void     AddPhysicsSignal(Int_t q)   {fPhysics += q;}          
- private:
+    virtual void     Print(Option_t *option="") const;
+  private:
     Int_t     fPadX;          // Pad number along x
     Int_t     fPadY;          // Pad number along y
     Int_t     fCathode;       // Cathode number

diff --git a/MUON/AliMUONDigitizer.cxx b/MUON/AliMUONDigitizer.cxx
index 03484a21b37abd815a600dc477cfb6547bfb2dc5..0559174b7e41a6c6cca24bfceb004f18b68a9411 100644 (file)
--- a/MUON/AliMUONDigitizer.cxx
+++ b/MUON/AliMUONDigitizer.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  2002/02/13 09:03:24  jchudoba
+Remove some deletes from dtor, those objects are deleted earlier in Exec() method (where they are created)
+
 Revision 1.7  2001/11/22 11:15:41  jchudoba
 Proper deletion of arrays (thanks to Rene Brun)
 
@@ -271,6 +274,7 @@ void AliMUONDigitizer::Exec(Option_t* option)
            fMask = fManager->GetMask(inputFile);
            fDigits[0] = ipx;
            fDigits[1] = ipy;
+           if (!(fHitMap[fNch]->ValidateHit(fDigits[0], fDigits[1]))) continue;
            fDigits[2] = icat;
            fDigits[3] = iqpad;
            if (inputFile == 0) {

diff --git a/MUON/AliMUONDisplay.cxx b/MUON/AliMUONDisplay.cxx
index 039dab54e71b0c692227dc5e75fee0880bae2fb8..a01cb0b43bd9fd47525096c1b51d3bef51fb2762 100644 (file)
--- a/MUON/AliMUONDisplay.cxx
+++ b/MUON/AliMUONDisplay.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.17  2001/09/03 14:54:55  gosset
+Corrections for suppressing "segmentation violation" errors
+when using buttons "Chamber +", "Chamber -", "Cathode <>"
+
 Revision 1.16  2001/08/31 08:18:43  jchudoba
 Changes needed to run with Root 3.01
 
@@ -925,6 +929,10 @@ void AliMUONDisplay::LoadDigits(Int_t chamber, Int_t cathode)
         mdig    = (AliMUONDigit*)muonDigits->UncheckedAt(digit);
        if (mdig->Cathode() != cathode-1) continue;
 
+// debug hit numbers
+//     printf("  Chamber, cathode, digit, hit: %3d, %3d, %3d, %3d \n",
+//            chamber,cathode,digit,mdig->Hit());
+
         //
         // First get all needed parameters
         //
@@ -1085,7 +1093,7 @@ void AliMUONDisplay::LoadHits(Int_t chamber)
            fPhits->AddAt(points,nhold+hit);
             points->SetMarkerColor(kRed);
             points->SetMarkerStyle(5);
-            points->SetMarkerSize(1.);
+            points->SetMarkerSize(2.); // JCH change
             points->SetParticle(mHit->Track());
             points->SetHitIndex(hit);
             points->SetTrackIndex(track);

diff --git a/MUON/AliMUONMerger.cxx b/MUON/AliMUONMerger.cxx
index e3ac8e8204c0362bc0834a33c0ebd643b7a391b0..eeea21a8893454b14b8a4900c1afd2b0e198a897 100644 (file)
--- a/MUON/AliMUONMerger.cxx
+++ b/MUON/AliMUONMerger.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  2002/02/22 12:14:21  morsch
+Validate pad hit before digitization.
+
 Revision 1.7  2001/11/22 11:15:41  jchudoba
 Proper deletion of arrays (thanks to Rene Brun)
 
@@ -233,10 +236,12 @@ void AliMUONMerger::Digitise()
 
        TTree *treeH  = gAlice->TreeH();
        Int_t ntracks = (Int_t) treeH->GetEntries();
+       treeH->SetBranchStatus("*",0); // switch off all branches
+        treeH->SetBranchStatus("MUON*",1); // switch on only MUON
 
        for (fTrack = 0; fTrack < ntracks; fTrack++) {
            gAlice->ResetHits();
-           treeH->GetEvent(fTrack);
+           treeH->GetEntry(fTrack,0);
 //
 //   Loop over hits
            for(AliMUONHit* mHit = (AliMUONHit*)pMUON->FirstHit(-1); 

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index eaf30d6cf6d73d9e23f0ac1109ac129e42dba226..a5881f184cd502d0cee3e6811961ac6b4627fdfa 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.29  2001/06/21 14:54:37  morsch
+Put volumes of station 3 into DIPO if present. (A. de Falco)
+
 Revision 1.28  2001/05/16 14:57:17  alibrary
 New files for folders and Stack
 
@@ -164,10 +167,9 @@ Log messages included.
 ClassImp(AliMUONv1)
  
 //___________________________________________
-AliMUONv1::AliMUONv1() : AliMUON()
+AliMUONv1::AliMUONv1()
 {
 // Constructor
-    fChambers = 0;
 }
  
 //___________________________________________
@@ -175,6 +177,7 @@ AliMUONv1::AliMUONv1(const char *name, const char *title)
        : AliMUON(name,title)
 {
 // Constructor
+//  this->SetDebug(2);
     AliMUONFactory::Build(this, title);
 }
 

diff --git a/MUON/MUONLinkDef.h b/MUON/MUONLinkDef.h
index 61e8eb33def8c04d2cf467cc63f4c2a0ecab2f8e..32de8514b1f190224720a59b3a34f71472601ed2 100644 (file)
--- a/MUON/MUONLinkDef.h
+++ b/MUON/MUONLinkDef.h
@@ -54,6 +54,7 @@
 #pragma link C++ class  AliMUONMerger+;
 #pragma link C++ class  AliMUONFactory+;
 #pragma link C++ class  AliMUONDigitizer+;
+#pragma link C++ class  AliMUONDigitContainer+;
 #endif
 
 

diff --git a/MUON/Makefile b/MUON/Makefile
index b82c3ab16b2db45d8e7aa946a529746bb85f53ef..63f403ee49fba58a4fbc7092ecb92382086411f0 100644 (file)
--- a/MUON/Makefile
+++ b/MUON/Makefile
@@ -36,7 +36,8 @@ SRCS         = AliMUONChamber.cxx AliMUONChamberTrigger.cxx \
               AliMUONSegmentationSlatModule.cxx AliMUONSegmentationSlatModuleN.cxx \
               AliMUONSegmentationSlat.cxx AliMUONSegmentationSlatN.cxx \
               AliMUONRecoEvent.cxx AliMUONRecoDisplay.cxx \
-               AliMUONMerger.cxx AliMUONFactory.cxx AliMUONDigitizer.cxx 
+               AliMUONMerger.cxx AliMUONFactory.cxx AliMUONDigitizer.cxx \
+               AliMUONDigitContainer.cxx
 
 # C++ Headers