Add Digits2Reco() and FindClusters()

Adapt call of cluster finder to new STEER.

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 59552da9c0ad05731d6c4b4f113b328ec583179c..67fb220b3fc6c8873eb5986e0a574f1fb9e7aef0 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -14,6 +14,9 @@
  **************************************************************************/
 /*
 $Log$
+Revision 1.47  2001/03/05 08:38:36  morsch
+Digitization related methods moved to AliMUONMerger.
+
 Revision 1.46  2001/01/26 21:34:59  morsch
 Use access functions for AliMUONHit, AliMUONDigit and AliMUONPadHit data members.
 
@@ -101,7 +104,7 @@ of chambers with overlapping modules (MakePadHits, Disintegration).
 
 Revision 1.23  2000/06/28 12:19:17  morsch
 More consequent seperation of global input data services (AliMUONClusterInput singleton) and the
-cluster and hit reconstruction algorithms in AliMUONClusterFinderVS.
+cluster and hit reconstruction algorithms in AliMUONClusterFindRawinderVS.
 AliMUONClusterFinderVS becomes the base class for clustering and hit reconstruction.
 It requires two cathode planes. Small modifications in the code will make it usable for
 one cathode plane and, hence, more general (for test beam data).
@@ -946,7 +949,12 @@ void AliMUON::Trigger(Int_t nev){
 
 
 //____________________________________________
-void AliMUON::FindClusters(Int_t nev,Int_t lastEntry)
+void AliMUON::Digits2Reco()
+{
+  FindClusters();
+}
+
+void AliMUON::FindClusters()
 {
 //
 //  Perform cluster finding
@@ -959,12 +967,13 @@ void AliMUON::FindClusters(Int_t nev,Int_t lastEntry)
 //
 // Loop on chambers and on cathode planes
 //
-    
+    ResetRawClusters();        
     for (Int_t ich = 0; ich < 10; ich++) {
        AliMUONChamber* iChamber = (AliMUONChamber*) (*fChambers)[ich];
-       AliMUONClusterFinderVS* rec = iChamber->ReconstructionModel();    
+       AliMUONClusterFinderVS* rec = iChamber->ReconstructionModel();
+    
        gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(lastEntry);
+       gAlice->TreeD()->GetEvent(0);
        TClonesArray *muonDigits = this->DigitsAddress(ich);
        ndig=muonDigits->GetEntriesFast();
        printf("\n 1 Found %d digits in %p %d", ndig, muonDigits,ich);
@@ -976,7 +985,7 @@ void AliMUON::FindClusters(Int_t nev,Int_t lastEntry)
                new(lhits1[n++]) AliMUONDigit(*digit);
        }
        gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(lastEntry+1);
+       gAlice->TreeD()->GetEvent(1);
        muonDigits  = this->DigitsAddress(ich);
        ndig=muonDigits->GetEntriesFast();
        printf("\n 2 Found %d digits in %p %d", ndig, muonDigits, ich);
@@ -996,17 +1005,8 @@ void AliMUON::FindClusters(Int_t nev,Int_t lastEntry)
        dig1->Delete();
        dig2->Delete();
     } // for ich
-    gAlice->TreeR()->Fill();
-    ResetRawClusters();
-    char hname[30];
-    sprintf(hname,"TreeR%d",nev);
-    gAlice->TreeR()->Write(hname,TObject::kOverwrite);
-    gAlice->TreeR()->Reset();
-    printf("\n End of cluster finding for event %d", nev);
-    
     delete dig1;
     delete dig2;
-    //gObjectTable->Print();
 }
  
 #ifdef never

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index b91c21b761d1889758d436ed26868f17d96dcbfe..de6374927b312242fcb1c6dddcc0deee53ca535f 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -60,7 +60,8 @@ class AliMUON : public  AliDetector {
     virtual void   ResetTrigger();
     virtual void   ResetRawClusters();
     // Cluster Finding
-    virtual void   FindClusters(Int_t event ,Int_t lastEntry);
+    virtual void   Digits2Reco();
+    virtual void   FindClusters();
     // Digitisation 
     virtual void   SDigits2Digits();      
 // Configuration Methods (per station id)