Adding bp/nbp info after manu Id.

[u/mrichter/AliRoot.git] / MUON / AliMUONRecoCheck.cxx

diff --git a/MUON/AliMUONRecoCheck.cxx b/MUON/AliMUONRecoCheck.cxx
index a68e5b65afb59dc08e97d8a102d5ea8ff60012fb..0661717be3ce287e58e9ca1e8257a5436565150c 100644 (file)
--- a/MUON/AliMUONRecoCheck.cxx
+++ b/MUON/AliMUONRecoCheck.cxx
@@ -49,44 +49,85 @@ ClassImp(AliMUONRecoCheck)
   fMuonTrackRef(0x0),
   fTrackReco(0x0),
   fReconstructibleTracks(0),
-  fRecoTracks(0)
+  fRecoTracks(0),
+  fIsLoadConstructor(kTRUE)
 {
-/// Constructor
+/// Constructor using "galice.root",
+/// takes care of loading/unloading Kinematics, TrackRefs and Tracks
 
   fMuonTrackRef = new TClonesArray("AliMUONTrack", 10);
 
-  // open the run loader
+  // run loader
   fRunLoader = AliRunLoader::Open(chLoader);
   if (!fRunLoader) {
-    AliError(Form("no run loader found in file %s","galice.root" ));
+    AliError(Form("no run loader found " ));
     return;
   }
-  // initialize loader's
+
+ // initialize loader   
   AliLoader *loader = fRunLoader->GetLoader("MUONLoader");
 
-  // initialize container
+  // container
   fMUONData  = new AliMUONData(loader,"MUON","MUON");
+  if (!fMUONData) {
+    AliError(Form("no MUONData found " ));
+    return;
+  }
 
-   // Loading AliRun master
-  if (fRunLoader->GetAliRun() == 0x0) fRunLoader->LoadgAlice();
-
-  fRunLoader->LoadKinematics("READ");
-  fRunLoader->LoadTrackRefs("READ");
+  fRunLoader->LoadKinematics("READ");   
+  fRunLoader->LoadTrackRefs("READ");    
   loader->LoadTracks("READ");
 
 }
 
+//_____________________________________________________________________________
+  AliMUONRecoCheck::AliMUONRecoCheck(AliRunLoader *runloader, AliMUONData *muondata)
+  : TObject(),
+  fRunLoader(0x0),
+  fMUONData(0x0),
+  fMuonTrackRef(0x0),
+  fTrackReco(0x0),
+  fReconstructibleTracks(0),
+  fRecoTracks(0),
+  fIsLoadConstructor(kFALSE)
+{
+/// Constructor from AliRunLoader and AliMUONData,
+/// does not load/unload Kinematics, TrackRefs and Tracks internally
+/// it should be done in the execution program (e.g. see MUONRecoCheck.C)
+
+  fMuonTrackRef = new TClonesArray("AliMUONTrack", 10);
+
+  // run loader
+  fRunLoader = runloader;
+  if (!fRunLoader) {
+    AliError(Form("no run loader found " ));
+    return;
+  }
+
+  // container
+  fMUONData  = muondata;
+  if (!fMUONData) {
+    AliError(Form("no MUONData found " ));
+    return;
+  }
+
+}
+
+
 //_____________________________________________________________________________
 AliMUONRecoCheck::~AliMUONRecoCheck()
 {
 /// Destructor
 
-  fRunLoader->UnloadKinematics();
-  fRunLoader->UnloadTrackRefs();
-  fRunLoader->UnloadTracks();
-  fMuonTrackRef->Delete();
   delete fMuonTrackRef;
-  delete fMUONData;
+
+  if(fIsLoadConstructor){
+    fRunLoader->UnloadKinematics();
+    fRunLoader->UnloadTrackRefs();
+    fRunLoader->UnloadTracks();
+    delete fMUONData;
+  }
+
 }
 
 //_____________________________________________________________________________
@@ -123,7 +164,6 @@ void AliMUONRecoCheck::MakeTrackRef()
 
   trackParam = new AliMUONTrackParam();
   hitForRec = new AliMUONHitForRec();
-  muonTrack = new AliMUONTrack();
 
   Int_t max = fRunLoader->GetHeader()->Stack()->GetNtrack();
   for (Int_t iTrackRef  = 0; iTrackRef < nTrackRef; iTrackRef++) {
@@ -136,6 +176,9 @@ void AliMUONRecoCheck::MakeTrackRef()
     if (!trackRefs->GetEntries()) continue; 
 
     while (isNewTrack) {
+
+      muonTrack = new AliMUONTrack();
+      
       for (Int_t iHit = iHitMin; iHit < trackRefs->GetEntries(); iHit++) {
       
        trackReference = (AliTrackReference*)trackRefs->At(iHit);
@@ -187,7 +230,7 @@ void AliMUONRecoCheck::MakeTrackRef()
        else iChamber = AliMUONConstants::ChamberNumber(z);
        hitForRec->SetChamberNumber(iChamber);
 
-       muonTrack->AddTrackParamAtHit(trackParam);
+       muonTrack->AddTrackParamAtHit(trackParam,0);
        muonTrack->AddHitForRecAtHit(hitForRec);
        muonTrack->SetTrackID(track);
 
@@ -224,8 +267,8 @@ void AliMUONRecoCheck::MakeTrackRef()
       }
 
       AddMuonTrackReference(muonTrack);
-      muonTrack->ResetTrackParamAtHit();
-      muonTrack->ResetHitForRecAtHit();
+      delete muonTrack;
+      muonTrack = NULL;
       
     } // end while isNewTrack
   }
@@ -234,7 +277,6 @@ void AliMUONRecoCheck::MakeTrackRef()
   
   ReconstructibleTracks();
 
-  delete muonTrack;
   delete trackParam;
   delete hitForRec;
 
@@ -245,10 +287,10 @@ TClonesArray* AliMUONRecoCheck::GetTrackReco()
 {
 /// Return TClonesArray of reconstructed tracks
 
-  GetMUONData()->ResetRecTracks();
-  GetMUONData()->SetTreeAddress("RT");
-  fTrackReco = GetMUONData()->RecTracks(); 
-  GetMUONData()->GetRecTracks();
+  fMUONData->ResetRecTracks();
+  fMUONData->SetTreeAddress("RT");
+  fTrackReco = fMUONData->RecTracks(); 
+  fMUONData->GetRecTracks();
   fRecoTracks = fTrackReco->GetEntriesFast();
   return fTrackReco;
 }
@@ -316,7 +358,6 @@ void AliMUONRecoCheck::CleanMuonTrackRef()
 
   hitForRec = new AliMUONHitForRec();
   trackParam = new AliMUONTrackParam();
-  trackNew = new AliMUONTrack();
 
   Int_t nTrackRef = fMuonTrackRef->GetEntriesFast();
   for (Int_t index = 0; index < nTrackRef; index++) {
@@ -325,6 +366,7 @@ void AliMUONRecoCheck::CleanMuonTrackRef()
     trackParamAtHit = track->GetTrackParamAtHit();
     trackParamAtVertex = track->GetTrackParamAtVertex();
     nTrackHits = hitForRecAtHit->GetEntriesFast();
+    trackNew = new AliMUONTrack();
     iHit1 = 0;
     while (iHit1 < nTrackHits) {
       hitForRec1 = (AliMUONHitForRec*) hitForRecAtHit->At(iHit1); 
@@ -394,16 +436,16 @@ void AliMUONRecoCheck::CleanMuonTrackRef()
        trackParam->SetInverseBendingMomentum(1./bendingMomentum);
 
       trackNew->AddHitForRecAtHit(hitForRec);
-      trackNew->AddTrackParamAtHit(trackParam);
+      trackNew->AddTrackParamAtHit(trackParam,0);
       
       iHit1++;
     } // end iHit1
 
     trackNew->SetTrackID(track->GetTrackID());
     trackNew->SetTrackParamAtVertex(trackParamAtVertex);
-    {new ((*newMuonTrackRef)[newMuonTrackRef->GetEntriesFast()]) AliMUONTrack(*trackNew);}    
-    trackNew->ResetHitForRecAtHit();
-    trackNew->ResetTrackParamAtHit();
+    {new ((*newMuonTrackRef)[newMuonTrackRef->GetEntriesFast()]) AliMUONTrack(*trackNew);}   
+    delete trackNew;
+    trackNew = NULL;
     
   } // end trackRef
 
@@ -414,8 +456,6 @@ void AliMUONRecoCheck::CleanMuonTrackRef()
     AddMuonTrackReference(track);
   }
   
-
-  delete trackNew;
   delete hitForRec;
   delete trackParam;
   newMuonTrackRef->Delete();