From Bogdan: Major changes in cluster access, recently changed for the MUON.

diff --git a/EVE/EveDet/AliEveMUONChamber.cxx b/EVE/EveDet/AliEveMUONChamber.cxx
index a0ccd5fdc2cfe8d7e4ad22d8656a838542c6ce6f..44588eb5f211b3871a453bb012f34eb9a72c7f4a 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamber.cxx
+++ b/EVE/EveDet/AliEveMUONChamber.cxx
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONChamber.h b/EVE/EveDet/AliEveMUONChamber.h
index b5c6333c0bc72bb11c525b826f5960498bc3ec89..253e7005dd5a5c6b72ab537736426ba8e0d1f3f3 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamber.h
+++ b/EVE/EveDet/AliEveMUONChamber.h
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONChamberData.cxx b/EVE/EveDet/AliEveMUONChamberData.cxx
index 0b34522e6167fff8d1d34605b844c65e9cdd9280..86e99321c926dd30c062defafd5f8fae699f3910 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamberData.cxx
+++ b/EVE/EveDet/AliEveMUONChamberData.cxx
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONChamberData.h b/EVE/EveDet/AliEveMUONChamberData.h
index 31871f3a4b0e36ba754362c248f8efd5bd26e9af..b8a8977f63e882f04d6fd7444ee40e5747339cdc 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamberData.h
+++ b/EVE/EveDet/AliEveMUONChamberData.h
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONChamberEditor.cxx b/EVE/EveDet/AliEveMUONChamberEditor.cxx
index a0e835b548609f362bce2e313860e40b01bd8446..3821c8c9ae1c75ca520fb1141eae8ccfe960f2f0 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamberEditor.cxx
+++ b/EVE/EveDet/AliEveMUONChamberEditor.cxx
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONChamberEditor.h b/EVE/EveDet/AliEveMUONChamberEditor.h
index b7646e5bd1f27ec93e813fd733f6c8e302d51039..8c2eb7774f90c35a683563ca8bccf3813b8237e0 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamberEditor.h
+++ b/EVE/EveDet/AliEveMUONChamberEditor.h
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONChamberGL.cxx b/EVE/EveDet/AliEveMUONChamberGL.cxx
index e58308a7a7abd2cbddf92d3c3c143ceb49222ae1..a9538bdaee4a88a0565285289f8215a79ac4b65f 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamberGL.cxx
+++ b/EVE/EveDet/AliEveMUONChamberGL.cxx
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
@@ -232,8 +232,13 @@ void AliEveMUONChamberGL::DrawChamberFrame() const
       yRad  = frameCoord[3];
       z     = frameCoord[4];
 
-      xRad += 0.0;
-      yRad += 0.0;
+      if (fChamber->GetID() < 2) {
+       xRad += TMath::Sign(15.0,(Double_t)xRad);
+       yRad += TMath::Sign(15.0,(Double_t)yRad);
+      } else {
+       xRad += TMath::Sign( 5.0,(Double_t)xRad);
+       yRad += TMath::Sign( 5.0,(Double_t)yRad);
+      }
 
       glBegin(GL_LINE_LOOP);
 

diff --git a/EVE/EveDet/AliEveMUONChamberGL.h b/EVE/EveDet/AliEveMUONChamberGL.h
index 802716708a23b52abcabf79c3d553cd4b95309c5..0ae8604e0fe9dee60992912674b952a8a94098a5 100644 (file)
--- a/EVE/EveDet/AliEveMUONChamberGL.h
+++ b/EVE/EveDet/AliEveMUONChamberGL.h
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONData.cxx b/EVE/EveDet/AliEveMUONData.cxx
index e7ad2068ca5364f0b451e7446f99474a65d351d2..95cad37b9d3302fb8b904013b5a107363e4a759a 100644 (file)
--- a/EVE/EveDet/AliEveMUONData.cxx
+++ b/EVE/EveDet/AliEveMUONData.cxx
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
@@ -7,16 +7,6 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-//
-// Sources:
-//
-// GetTrackerMapping = AliMUONDigitMaker::GetMapping
-// GetTriggerMapping = AliMUONDigitMaker::TriggerDigits
-// GetTriggerChamber = AliMUONDigitMaker::GetTriggerChamber
-// LoadRawTracker    = MUONRawStreamTracker.C
-// LoadRawTrigger    = MUONRawStreamTrigger.C
-//
-
 #include "AliEveMUONData.h"
 
 #include <EveDet/AliEveMUONChamberData.h>
@@ -36,10 +26,15 @@
 #include <AliMUONVDigit.h>
 #include "AliMUONDigitStoreV1.h"
 #include "AliMUONVDigitStore.h"
+#include "AliMUONTrackParam.h"
+#include "AliMUONTrack.h"
+#include "AliESDMuonTrack.h"
+#include "AliESDEvent.h"
 #include "TTree.h"
 #include "TString.h"
 #include "TClonesArray.h"
 #include "TList.h"
+#include "TFile.h"
 
 
 //______________________________________________________________________________
@@ -248,6 +243,66 @@ void AliEveMUONData::LoadRecPoints(TTree* tree)
 
 }
 
+//______________________________________________________________________________
+void AliEveMUONData::LoadRecPointsFromESD(Char_t *fileName)
+{
+  //
+  // load reconstructed points stored in AliESDs.root
+  // load local trigger information
+  //
+
+  TFile* esdFile = TFile::Open(fileName);
+  if (!esdFile || !esdFile->IsOpen()) {
+    cout << "opening ESD file " << fileName << "failed" << endl;
+    return;
+  }
+  TTree* esdTree = (TTree*) esdFile->Get("esdTree");
+  if (!esdTree) {
+    cout << "no ESD tree found" << endl;
+    esdFile->Close();
+    return;
+  }
+  AliESDEvent* esdEvent = new AliESDEvent();
+  esdEvent->ReadFromTree(esdTree);
+
+  AliMUONVCluster *cluster;
+  AliMUONTrackParam *trackParam;
+  AliESDMuonTrack *esdTrack;
+  Int_t detElemId, chamber, nTrackParam;
+  Double_t clsX, clsY, clsZ, charge;
+  
+  if (esdTree->GetEvent(gEvent->GetEventId()) <= 0) {
+    cout << "fails to read ESD object for event " << gEvent->GetEventId() << endl;
+    return;
+  }
+    
+  Int_t nTracks = Int_t(esdEvent->GetNumberOfMuonTracks());
+  for (Int_t iTrack = 0; iTrack < nTracks; iTrack++) {
+    esdTrack = esdEvent->GetMuonTrack(iTrack);
+    if (!esdTrack->ClustersStored()) continue;
+    AliMUONTrack muonTrack(*esdTrack);
+    nTrackParam = muonTrack.GetTrackParamAtCluster()->GetEntries();
+    for(Int_t iCluster = 0; iCluster < nTrackParam; iCluster++) {
+      trackParam = (AliMUONTrackParam *) muonTrack.GetTrackParamAtCluster()->At(iCluster);
+      cluster = trackParam->GetClusterPtr();
+      chamber   = cluster->GetChamberId();
+      detElemId = cluster->GetDetElemId();
+      charge  = cluster->GetCharge();
+      clsX = cluster->GetX();
+      clsY = cluster->GetY();
+      clsZ = cluster->GetZ();
+      
+      fChambers[chamber]->RegisterCluster(detElemId,0,clsX,clsY,clsZ,charge);
+      fChambers[chamber]->RegisterCluster(detElemId,1,clsX,clsY,clsZ,charge);
+      
+    }
+  }
+
+  delete esdEvent;
+  esdFile->Close();
+
+}
+
 //______________________________________________________________________________
 void AliEveMUONData::LoadHits(TTree* tree)
 {

diff --git a/EVE/EveDet/AliEveMUONData.h b/EVE/EveDet/AliEveMUONData.h
index 73c9cb872b8c88265ce034aac2acdcac5d448ec0..706e626e0f81f7f8640a493fc1871f5d731ac448 100644 (file)
--- a/EVE/EveDet/AliEveMUONData.h
+++ b/EVE/EveDet/AliEveMUONData.h
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
@@ -47,6 +47,7 @@ class AliEveMUONData : public TObject, public TEveRefCnt
 
   void LoadDigits(TTree* tree);
   void LoadRecPoints(TTree* tree);
+  void LoadRecPointsFromESD(Char_t *fileName);
   void LoadHits(TTree* tree);
   void LoadRaw(TString fileName);
 

diff --git a/EVE/EveDet/AliEveMUONTrack.cxx b/EVE/EveDet/AliEveMUONTrack.cxx
index c8b68a6a473c613ba2a0f232fd7f21c6d719646e..79682e4cc5fab4d4e2d934f16481c0f878ec993d 100644 (file)
--- a/EVE/EveDet/AliEveMUONTrack.cxx
+++ b/EVE/EveDet/AliEveMUONTrack.cxx
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *

diff --git a/EVE/EveDet/AliEveMUONTrack.h b/EVE/EveDet/AliEveMUONTrack.h
index 4d09a86303f854d273c0286ac8efcd7c6b4182e5..559dc375c439d2bd1bcc361a603a1dd95c5e0ad7 100644 (file)
--- a/EVE/EveDet/AliEveMUONTrack.h
+++ b/EVE/EveDet/AliEveMUONTrack.h
@@ -1,5 +1,5 @@
 // $Id$
-// Main authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
+// Main authors: Matevz Tadel & Alja Mrak-Tadel & Bogdan Vulpescu: 2006, 2007
 
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *