Correction of the errourness last commit.

diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx
index 8412185b70411f172ee75784c145a52597e803dd..af46b1c5e21b1080f4ad057186c361ef95662fa6 100644 (file)
--- a/MUON/AliMUONConstants.cxx
+++ b/MUON/AliMUONConstants.cxx
@@ -49,7 +49,7 @@ Add class AliMUONConstants with MUON specific constants using static memeber dat
 
 ClassImp(AliMUONConstants)
 
-const Int_t   AliMUONConstants::fgNCh = 14;
+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 068699ca974cef6f477642d985ef40c12cbadd1a..053256caf4c023e3f623782f3b9d04e9e92ebac4 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 const Int_t  fgNCh;                //  Number of Chambers    
+    static 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 c08778727c2945c441b6a118f340d22f252f2945..5a35a107e75ed9a2628d3e7d45db4de76a804f4e 100644 (file)
--- a/MUON/AliMUONDigit.cxx
+++ b/MUON/AliMUONDigit.cxx
@@ -34,8 +34,6 @@ Was before in DataStructures.cxx
 
 #include "AliMUONDigit.h"
 
-#include <iostream.h>
-
 ClassImp(AliMUONDigit)
 //_____________________________________________________________________________
 AliMUONDigit::AliMUONDigit(Int_t *digits)
@@ -74,14 +72,3 @@ 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 862ae463a0e694c84363ad6ca4ba29d0a9dac921..a0331c5677ef192be64ed6dcf6cb59acfb180545 100644 (file)
--- a/MUON/AliMUONDigit.h
+++ b/MUON/AliMUONDigit.h
@@ -27,8 +27,7 @@ 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;}          
-    virtual void     Print(Option_t *option="") const;
-  private:
+ 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 0559174b7e41a6c6cca24bfceb004f18b68a9411..f2adfb2e3d7ed0229ac373ce14d642f13381f483 100644 (file)
--- a/MUON/AliMUONDigitizer.cxx
+++ b/MUON/AliMUONDigitizer.cxx
@@ -274,7 +274,6 @@ 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 a01cb0b43bd9fd47525096c1b51d3bef51fb2762..41fe808430964652161e252da869ffe1a53f09ab 100644 (file)
--- a/MUON/AliMUONDisplay.cxx
+++ b/MUON/AliMUONDisplay.cxx
@@ -929,10 +929,6 @@ 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
         //
@@ -1093,7 +1089,7 @@ void AliMUONDisplay::LoadHits(Int_t chamber)
            fPhits->AddAt(points,nhold+hit);
             points->SetMarkerColor(kRed);
             points->SetMarkerStyle(5);
-            points->SetMarkerSize(2.); // JCH change
+            points->SetMarkerSize(1.);
             points->SetParticle(mHit->Track());
             points->SetHitIndex(hit);
             points->SetTrackIndex(track);

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index a5881f184cd502d0cee3e6811961ac6b4627fdfa..13a83b96ba752ce5a804129931e7d69ff67efb7a 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -167,9 +167,10 @@ Log messages included.
 ClassImp(AliMUONv1)
  
 //___________________________________________
-AliMUONv1::AliMUONv1()
+AliMUONv1::AliMUONv1() : AliMUON()
 {
 // Constructor
+    fChambers = 0;
 }
  
 //___________________________________________
@@ -177,7 +178,6 @@ 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 32de8514b1f190224720a59b3a34f71472601ed2..61e8eb33def8c04d2cf467cc63f4c2a0ecab2f8e 100644 (file)
--- a/MUON/MUONLinkDef.h
+++ b/MUON/MUONLinkDef.h
@@ -54,7 +54,6 @@
 #pragma link C++ class  AliMUONMerger+;
 #pragma link C++ class  AliMUONFactory+;
 #pragma link C++ class  AliMUONDigitizer+;
-#pragma link C++ class  AliMUONDigitContainer+;
 #endif