**************************************************************************/
/* $Id$ */
+//-----------------------------------------------------------------------------
/// \class AliMUONReconstructor
///
/// Implementation of AliReconstructor for MUON subsystem.
///
-/// The behavior of the MUON reconstruction can be changed, besides
-/// the usual methods found in AliReconstruction (e.g. to disable tracking)
-/// by using AliReconstruction::SetOption("MUON",options)
-/// where options should be a space separated string.
+/// The clustering mode and the associated parameters can be changed through the
+/// AliMUONRecoParam object set in the reconstruction macro or read from the CDB
+/// (see methods in AliMUONRecoParam.h file for details)
///
-/// Valid options are :
-///
-/// SAVEDIGITS : if you want to save in the TreeD the *calibrated* digits
-/// that are used for the clustering
+/// Valid modes are :
///
/// SIMPLEFIT : use the AliMUONClusterFinderSimpleFit clusterizer
///
-/// AZ : use the AliMUONClusterFinderAZ clusterizer (default)
+/// SIMPLEFITV3 : SIMPLEFIT with preclustering=PRECLUSTERV3
+///
+/// MLEM : use AliMUONClusterFinderMLEM and AliMUONPreClusterFinder for preclustering (default)
+/// MLEMV2 : MLEM with preclustering=PRECLUSTERV2
+/// MLEMV3 : MLEM with preclustering=PRECLUSTERV3
///
/// PRECLUSTER : use only AliMUONPreClusterFinder. Only for debug as
/// the produced clusters do not have a position, hence the tracking will not
/// work
+/// PRECLUSTERV2 : another version of the preclustering
+/// PRECLUSTERV3 : yet another version of the preclustering
///
/// COG : use AliMUONClusterFinderCOG clusterizer. Not really a production
/// option either, as center-of-gravity is generally not a good estimate
/// of the cluster position...
///
+/// PEAKCOG : COG cluster finder around local maxima
+/// PEAKFIT : fit around local maxima with up to 3 peaks, COG otherwise
+///
/// NOCLUSTERING : bypass completely the clustering stage
///
-/// NOSTATUSMAP : disable the computation and usage of the pad status map. Only
-/// for debug !
+/// ------
+///
+/// The behavior of the MUON reconstruction can also be changed, besides
+/// the usual methods found in AliReconstruction (e.g. to disable tracking)
+/// by using AliReconstruction::SetOption("MUON",options)
+/// where options should be a space separated string.
+///
+/// Valid options are :
+///
+/// SAVEDIGITS : if you want to save in the TreeD the *calibrated* digits
+/// that are used for the clustering
+///
+/// DIGITSTOREV1 : use the V1 implementation of the digitstore
+/// DIGITSTOREV2R : use the V2R implementation of the digitstore
///
/// NOLOCALRECONSTRUCTION : for debug, to disable local reconstruction (and hence
/// "recover" old behavior)
///
/// TRIGGERDISABLE : disable the treatment of MUON trigger
///
+/// NOFASTTRKDECODER : makes the digit maker class use the non-high performance decoder
+/// AliMUONPayloadTracker instead of AliMUONTrackerDDLDecoder.
+///
+/// NOFASTTRGDECODER : makes the digit maker class use the non-high performance decoder
+/// AliMUONPayloadTrigger instead of AliMUONTriggerDDLDecoder.
+///
+/// NOFASTDECODERS : makes the digit maker class use the non-high performance decoders
+/// AliMUONPayloadTracker and AliMUONPayloadTrigger.
+///
/// \author Laurent Aphecetche, Subatech
+//-----------------------------------------------------------------------------
#include "AliMUONReconstructor.h"
-#include "AliCDBManager.h"
-#include "AliLoader.h"
-#include "AliLog.h"
-#include "AliRunLoader.h"
#include "AliMUONCalibrationData.h"
#include "AliMUONClusterFinderCOG.h"
#include "AliMUONClusterFinderMLEM.h"
#include "AliMUONClusterFinderSimpleFit.h"
-#include "AliMUONClusterFinderAZ.h"
-#include "AliMUONClusterReconstructor.h"
+#include "AliMUONClusterFinderPeakCOG.h"
+#include "AliMUONClusterFinderPeakFit.h"
#include "AliMUONClusterStoreV1.h"
+#include "AliMUONClusterStoreV2.h"
#include "AliMUONConstants.h"
#include "AliMUONDigitCalibrator.h"
#include "AliMUONDigitMaker.h"
#include "AliMUONDigitStoreV1.h"
+#include "AliMUONDigitStoreV2R.h"
#include "AliMUONGeometryTransformer.h"
#include "AliMUONPreClusterFinder.h"
+#include "AliMUONPreClusterFinderV2.h"
+#include "AliMUONPreClusterFinderV3.h"
+#include "AliMUONSimpleClusterServer.h"
#include "AliMUONTracker.h"
-#include "AliMUONVTrackStore.h"
#include "AliMUONTriggerCircuit.h"
-#include "AliMUONTriggerCrateStore.h"
#include "AliMUONTriggerStoreV1.h"
#include "AliMUONVClusterFinder.h"
+#include "AliMUONVClusterServer.h"
+#include "AliMUONVTrackStore.h"
+
+#include "AliMpArea.h"
+#include "AliMpCDB.h"
+#include "AliMpConstants.h"
+#include "AliMpDDLStore.h"
+#include "AliMpSegmentation.h"
+
#include "AliRawReader.h"
-#include "AliMUONStopwatchGroup.h"
-#include "AliMUONStopwatchGroupElement.h"
+#include "AliCDBManager.h"
+#include "AliCodeTimer.h"
+#include "AliLog.h"
+
#include <Riostream.h>
+#include <TObjArray.h>
#include <TClonesArray.h>
#include <TString.h>
#include <TTree.h>
//_____________________________________________________________________________
AliMUONReconstructor::AliMUONReconstructor() :
AliReconstructor(),
-fCrateManager(0x0),
fDigitMaker(0x0),
-fTransformer(new AliMUONGeometryTransformer(kTRUE)),
+fTransformer(new AliMUONGeometryTransformer()),
fDigitStore(0x0),
fTriggerCircuit(0x0),
fCalibrationData(0x0),
fDigitCalibrator(0x0),
-fClusterReconstructor(0x0),
-fClusterStore(0x0),
+fClusterServer(0x0),
fTriggerStore(0x0),
fTrackStore(0x0),
-fTimers(new AliMUONStopwatchGroup)
+fClusterStore(0x0)
{
/// normal ctor
- fTransformer->ReadGeometryData("volpath.dat", "geometry.root");
+
+ AliDebug(1,"");
+
+ // Unload and delete old mapping
+ AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/Mapping");
+ AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/DDLStore");
+ delete AliMpDDLStore::Instance();
+ delete AliMpSegmentation::Instance();
+
+ // Load mapping
+ if ( ! AliMpCDB::LoadDDLStore() ) {
+ AliFatal("Could not access mapping from OCDB !");
+ }
+
+ // Load geometry data
+ fTransformer->LoadGeometryData();
+
}
//_____________________________________________________________________________
AliMUONReconstructor::~AliMUONReconstructor()
{
/// dtor
+
+ AliDebug(1,"");
+
delete fDigitMaker;
delete fDigitStore;
delete fTransformer;
- delete fCrateManager;
delete fTriggerCircuit;
delete fCalibrationData;
delete fDigitCalibrator;
- delete fClusterReconstructor;
- delete fClusterStore;
+ delete fClusterServer;
delete fTriggerStore;
delete fTrackStore;
- AliInfo("Timers:");
- fTimers->Print();
- delete fTimers;
+ delete fClusterStore;
+
+ delete AliMpSegmentation::Instance(false);
+ delete AliMpDDLStore::Instance(false);
}
//_____________________________________________________________________________
{
CreateCalibrator();
}
- AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()));
+ AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()))
fDigitCalibrator->Calibrate(digitStore);
}
-//_____________________________________________________________________________
-void
-AliMUONReconstructor::Clusterize(const AliMUONVDigitStore& digitStore,
- AliMUONVClusterStore& clusterStore) const
-{
- /// Creates clusters from digits.
-
- TString sopt(GetOption());
- sopt.ToUpper();
- if ( sopt.Contains("NOCLUSTERING") ) return;
-
- if (!fClusterReconstructor)
- {
- CreateClusterReconstructor();
- }
-
- AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Digits2Clusters(const AliMUONVDigitStore&,AliMUONVClusterStore&)",
- fClusterReconstructor->ClassName()));
- fClusterReconstructor->Digits2Clusters(digitStore,clusterStore);
-}
-
-//_____________________________________________________________________________
-AliMUONVClusterStore*
-AliMUONReconstructor::ClusterStore() const
-{
- /// Return (and create if necessary) the cluster container
- if (!fClusterStore)
- {
- fClusterStore = new AliMUONClusterStoreV1;
- }
- return fClusterStore;
-}
-
//_____________________________________________________________________________
void
AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader,
{
/// Convert raw data into digit and trigger stores
CreateDigitMaker();
- AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Raw2Digits(AliRawReader*,AliMUONVDigitStore*,AliMUONVTriggerStore*)",
- fDigitMaker->ClassName()));
+
+ AliCodeTimerStart(Form("%s::Raw2Digits(AliRawReader*,AliMUONVDigitStore*,AliMUONVTriggerStore*)",
+ fDigitMaker->ClassName()))
fDigitMaker->Raw2Digits(rawReader,digitStore,triggerStore);
+ AliCodeTimerStop(Form("%s::Raw2Digits(AliRawReader*,AliMUONVDigitStore*,AliMUONVTriggerStore*)",
+ fDigitMaker->ClassName()))
Calibrate(*digitStore);
}
AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const
{
/// convert raw data into a digit tree
+ AliCodeTimerAuto("")
Bool_t alone = ( TriggerStore() == 0 );
else
{
ConvertDigits(rawReader,DigitStore(),TriggerStore());
+ AliCodeTimerStart("Fill digits")
digitsTree->Fill();
+ AliCodeTimerStop("Fill digits")
DigitStore()->Clear();
}
}
-//_____________________________________________________________________________
-AliMUONTriggerCrateStore*
-AliMUONReconstructor::CrateManager() const
-{
- /// Return (and create if necessary) the trigger crate store
- if (fCrateManager) return fCrateManager;
- fCrateManager = new AliMUONTriggerCrateStore;
- fCrateManager->ReadFromFile();
- return fCrateManager;
-}
-
//_____________________________________________________________________________
void
AliMUONReconstructor::CreateDigitMaker() const
/// Create (and create if necessary) the digit maker
if (fDigitMaker) return;
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateDigitMaker()");
+ AliCodeTimerAuto("")
- fDigitMaker = new AliMUONDigitMaker;
+ TString option = GetOption();
+ Bool_t enableErrorLogging = kTRUE;
+ Bool_t useFastTrackerDecoder = kTRUE;
+ Bool_t useFastTriggerDecoder = kTRUE;
+ if (option.Contains("NOFASTTRKDECODER"))
+ {
+ useFastTrackerDecoder = kFALSE;
+ }
+ if (option.Contains("NOFASTTRGDECODER"))
+ {
+ useFastTriggerDecoder = kFALSE;
+ }
+ if (option.Contains("NOFASTDECODERS"))
+ {
+ useFastTrackerDecoder = kFALSE;
+ useFastTriggerDecoder = kFALSE;
+ }
+ fDigitMaker = new AliMUONDigitMaker(
+ enableErrorLogging, useFastTrackerDecoder, useFastTriggerDecoder
+ );
+ option.ToUpper();
+ if ( option.Contains("SAVEDIGITS" ))
+ {
+ fDigitMaker->SetMakeTriggerDigits(kTRUE);
+ }
}
//_____________________________________________________________________________
/// Return (and create if necessary) the trigger circuit object
if (fTriggerCircuit) return;
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateTriggerCircuit()");
+ AliCodeTimerAuto("")
fTriggerCircuit = new AliMUONTriggerCircuit(fTransformer);
}
+
//_____________________________________________________________________________
AliTracker*
-AliMUONReconstructor::CreateTracker(AliRunLoader* runLoader) const
+AliMUONReconstructor::CreateTracker() const
{
/// Create the MUONTracker object
- /// The MUONTracker is passed the GetOption(), i.e. our own options
CreateTriggerCircuit();
CreateDigitMaker();
+ CreateClusterServer();
+
+ AliMUONTracker* tracker(0x0);
- AliLoader* loader = runLoader->GetDetectorLoader("MUON");
- if (!loader)
+ if ( ! GetRecoParam()->CombineClusterTrackReco() )
{
- AliError("Cannot get MUONLoader, so cannot create MUONTracker");
- return 0x0;
+ tracker = new AliMUONTracker(GetRecoParam(),
+ 0x0,
+ *DigitStore(),
+ fDigitMaker,
+ fTransformer,
+ fTriggerCircuit);
}
- AliMUONTracker* tracker = new AliMUONTracker(loader,fDigitMaker,fTransformer,fTriggerCircuit);
- tracker->SetOption(GetOption());
+ else
+ {
+ tracker = new AliMUONTracker(GetRecoParam(),
+ fClusterServer,
+ *DigitStore(),
+ fDigitMaker,
+ fTransformer,
+ fTriggerCircuit);
+ }
+
return tracker;
}
//_____________________________________________________________________________
-void
-AliMUONReconstructor::CreateClusterReconstructor() const
+AliMUONVClusterFinder*
+AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType)
{
- /// Create cluster reconstructor, depending on GetOption()
+ /// Create a given cluster finder instance
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateClusterReconstructor()");
+ AliCodeTimerAutoGeneral("")
- AliDebug(1,"");
-
AliMUONVClusterFinder* clusterFinder(0x0);
- TString opt(GetOption());
+ TString opt(clusterFinderType);
opt.ToUpper();
- if ( strstr(opt,"PRECLUSTER") )
+ if ( strstr(opt,"PRECLUSTERV2") )
+ {
+ clusterFinder = new AliMUONPreClusterFinderV2;
+ }
+ else if ( strstr(opt,"PRECLUSTERV3") )
+ {
+ clusterFinder = new AliMUONPreClusterFinderV3;
+ }
+ else if ( strstr(opt,"PRECLUSTER") )
{
clusterFinder = new AliMUONPreClusterFinder;
}
+ else if ( strstr(opt,"PEAKCOG") )
+ {
+ clusterFinder = new AliMUONClusterFinderPeakCOG(kFALSE,new AliMUONPreClusterFinder);
+ }
+ else if ( strstr(opt,"PEAKFIT") )
+ {
+ clusterFinder = new AliMUONClusterFinderPeakFit(kFALSE,new AliMUONPreClusterFinder);
+ }
else if ( strstr(opt,"COG") )
{
- clusterFinder = new AliMUONClusterFinderCOG;
+ clusterFinder = new AliMUONClusterFinderCOG(new AliMUONPreClusterFinder);
}
+ else if ( strstr(opt,"SIMPLEFITV3") )
+ {
+ clusterFinder = new AliMUONClusterFinderSimpleFit(new AliMUONClusterFinderCOG(new AliMUONPreClusterFinderV3));
+ }
else if ( strstr(opt,"SIMPLEFIT") )
{
- clusterFinder = new AliMUONClusterFinderSimpleFit;
+ clusterFinder = new AliMUONClusterFinderSimpleFit(new AliMUONClusterFinderCOG(new AliMUONPreClusterFinder));
}
else if ( strstr(opt,"MLEM:DRAW") )
{
- clusterFinder = new AliMUONClusterFinderMLEM(kTRUE);
+ clusterFinder = new AliMUONClusterFinderMLEM(kTRUE,new AliMUONPreClusterFinder);
}
- else if ( strstr(opt,"MLEM") )
+ else if ( strstr(opt,"MLEMV3") )
{
- clusterFinder = new AliMUONClusterFinderMLEM(kFALSE);
+ clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinderV3);
}
- else if ( strstr(opt,"AZ") )
+ else if ( strstr(opt,"MLEMV2") )
{
- clusterFinder = new AliMUONClusterFinderAZ;
- }
+ clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinderV2);
+ }
+ else if ( strstr(opt,"MLEM") )
+ {
+ clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinder);
+ }
else
{
- clusterFinder = new AliMUONClusterFinderAZ;
+ AliErrorClass(Form("clustering mode \"%s\" does not exist",opt.Data()));
+ return 0x0;
}
- if ( clusterFinder )
- {
- AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName()));
- }
+ return clusterFinder;
+}
+
+//_____________________________________________________________________________
+void
+AliMUONReconstructor::CreateClusterServer() const
+{
+ /// Create cluster server
- fClusterReconstructor = new AliMUONClusterReconstructor(clusterFinder,fTransformer);
+ if ( fClusterServer ) return;
+
+ AliCodeTimerAuto("");
+
+ AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(GetRecoParam()->GetClusteringMode());
+
+ if ( !clusterFinder ) return;
+
+ AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName()));
+
+ fClusterServer = new AliMUONSimpleClusterServer(clusterFinder,*fTransformer);
}
//_____________________________________________________________________________
{
/// Create the calibrator
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateCalibrator()");
+ AliCodeTimerAuto("")
Int_t runNumber = AliCDBManager::Instance()->GetRun();
TString opt(GetOption());
opt.ToUpper();
- Bool_t statusMap(kTRUE);
if ( strstr(opt,"NOSTATUSMAP") )
{
- AliWarning("Disconnecting status map : SHOULD BE USED FOR DEBUG ONLY. NOT FOR PRODUCTION !!!");
- statusMap = kFALSE;
+ AliWarning("NOSTATUSMAP is obsolete");
}
- fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,statusMap);
+
+ TString calibMode = GetRecoParam()->GetCalibrationMode();
+
+ fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam(),calibMode.Data());
}
//_____________________________________________________________________________
/// Return (and create if necessary) the digit container
if (!fDigitStore)
{
- fDigitStore = new AliMUONDigitStoreV1;
+ TString sopt(GetOption());
+ sopt.ToUpper();
+
+ AliInfo(Form("Options=%s",sopt.Data()));
+
+ if ( sopt.Contains("DIGITSTOREV1") )
+ {
+ fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV1");
+ }
+ else if ( sopt.Contains("DIGITSTOREV2R") )
+ {
+ fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV2R");
+ }
+ else if ( sopt.Contains("DIGITSTOREV2S") )
+ {
+ fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV2S");
+ }
+
+ if (!fDigitStore) fDigitStore = AliMUONVDigitStore::Create("AliMUONDigitStoreV2R");
+
+ AliInfo(Form("Will use %s to store digits during reconstruction",fDigitStore->ClassName()));
}
return fDigitStore;
}
//_____________________________________________________________________________
void
AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
- AliMUONVClusterStore* clusterStore,
TTree& clustersTree) const
{
/// Write the trigger and cluster information into TreeR
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::FillTreeR()");
+ AliCodeTimerAuto("")
AliDebug(1,"");
Bool_t ok(kFALSE);
+ Bool_t alone(kTRUE); // is trigger the only info in TreeR ?
+
+ if ( ! GetRecoParam()->CombineClusterTrackReco() )
+ {
+ alone = kFALSE; // we'll get both tracker and trigger information in TreeR
+ }
+
if ( triggerStore )
{
- Bool_t alone = ( clusterStore ? kFALSE : kTRUE );
ok = triggerStore->Connect(clustersTree,alone);
if (!ok)
{
AliError("Could not create triggerStore branches in TreeR");
}
}
-
- if ( clusterStore )
+
+ if ( !alone )
{
- Bool_t alone = ( triggerStore ? kFALSE : kTRUE );
- ok = clusterStore->Connect(clustersTree,alone);
- if (!ok)
+ if (!fClusterStore)
{
- AliError("Could not create triggerStore branches in TreeR");
- }
+ fClusterStore = new AliMUONClusterStoreV2;
+ }
+
+ CreateClusterServer();
+
+ TIter next(DigitStore()->CreateIterator());
+ fClusterServer->UseDigits(next);
+
+ AliMpArea area;
+
+ AliDebug(1,Form("Doing full clusterization in local reconstruction using %s ",fClusterServer->ClassName()));
+
+ for ( Int_t i = 0; i < AliMpConstants::NofTrackingChambers(); ++i )
+ {
+ if (GetRecoParam()->UseChamber(i))
+ {
+ if ( ( i == 6 || i == 7 ) && GetRecoParam()->BypassSt4() ) continue;
+ if ( ( i == 8 || i == 9 ) && GetRecoParam()->BypassSt5() ) continue;
+
+ fClusterServer->Clusterize(i,*fClusterStore,area,GetRecoParam());
+ }
+ }
+
+ Bool_t cok = fClusterStore->Connect(clustersTree,alone);
+
+ if (!cok) AliError("Could not connect clusterStore to clusterTree");
+
+ AliDebug(1,Form("Number of clusters found = %d",fClusterStore->GetSize()));
+
+ StdoutToAliDebug(1,fClusterStore->Print());
}
-
+
if (ok) // at least one type of branches created successfully
{
clustersTree.Fill();
}
+
+ if (fClusterStore) fClusterStore->Clear();
}
//_____________________________________________________________________________
}
}
-//_____________________________________________________________________________
-Bool_t
-AliMUONReconstructor::HasLocalReconstruction() const
-{
- /// Whether or not we have local reconstruction
- TString opt(GetOption());
- opt.ToUpper();
- if ( opt.Contains("NOLOCALRECONSTRUCTION" ) )
- {
- return kFALSE;
- }
- else
- {
- return kTRUE;
- }
-}
-
//_____________________________________________________________________________
void
AliMUONReconstructor::Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const
return;
}
- if ( DigitStore() )
- {
- ConvertDigits(rawReader,DigitStore(),TriggerStore());
- Clusterize(*(DigitStore()),*(ClusterStore()));
- }
-
- FillTreeR(TriggerStore(),ClusterStore(),*clustersTree);
-}
+ ConvertDigits(rawReader,DigitStore(),TriggerStore());
-//_____________________________________________________________________________
-void
-AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
-{
- /// Reconstruct simulated data
-
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::Reconstruct(AliRunLoader*)");
-
- AliLoader* loader = runLoader->GetDetectorLoader("MUON");
- if (!loader)
- {
- AliError("Could not get MUON loader");
- return;
- }
-
- Int_t nEvents = runLoader->GetNumberOfEvents();
-
- for ( Int_t i = 0; i < nEvents; ++i )
- {
- runLoader->GetEvent(i);
-
- loader->LoadRecPoints("update");
- loader->CleanRecPoints();
- loader->MakeRecPointsContainer();
- TTree* clustersTree = loader->TreeR();
-
- loader->LoadDigits("read");
- TTree* digitsTree = loader->TreeD();
-
- Reconstruct(digitsTree,clustersTree);
-
- loader->UnloadDigits();
- loader->WriteRecPoints("OVERWRITE");
- loader->UnloadRecPoints();
- }
-}
-
-//_____________________________________________________________________________
-void
-AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* rawReader) const
-{
- /// This method is called by AliReconstruction if HasLocalReconstruction()==kFALSE
-
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::Reconstruct(AliRunLoader*, AliRawReader*)");
-
- AliLoader* loader = runLoader->GetDetectorLoader("MUON");
- if (!loader)
- {
- AliError("Could not get MUON loader");
- return;
- }
-
- Int_t i(0);
-
- while (rawReader->NextEvent())
- {
- runLoader->GetEvent(i++);
-
- loader->LoadRecPoints("update");
- loader->CleanRecPoints();
- loader->MakeRecPointsContainer();
- TTree* clustersTree = loader->TreeR();
-
- loader->LoadDigits("update");
- loader->CleanDigits();
- loader->MakeDigitsContainer();
- TTree* digitsTree = loader->TreeD();
- ConvertDigits(rawReader, digitsTree);
- loader->WriteDigits("OVERWRITE");
-
- Reconstruct(digitsTree,clustersTree);
-
- loader->UnloadDigits();
- loader->WriteRecPoints("OVERWRITE");
- loader->UnloadRecPoints();
- }
+ FillTreeR(TriggerStore(),*clustersTree);
}
//_____________________________________________________________________________
/// This method is called by AliReconstruction if HasLocalReconstruction()==kTRUE
/// AND HasDigitConversion()==kTRUE
+ AliCodeTimerAuto("")
+
AliDebug(1,"");
if (!digitsTree || !clustersTree)
if ( fDigitStore )
{
- Clusterize(*fDigitStore,*(ClusterStore()));
+ // Insure we got calibrated digits (if we reconstruct from pure simulated,
+ // i.e. w/o going through raw data, this will be the case)
+ TIter next(fDigitStore->CreateIterator());
+ AliMUONVDigit* digit = static_cast<AliMUONVDigit*>(next());
+ if (digit && !digit->IsCalibrated())
+ {
+ Calibrate(*fDigitStore);
+ }
}
- FillTreeR(fTriggerStore,ClusterStore(),*clustersTree);
+ FillTreeR(fTriggerStore,*clustersTree);
}
//_____________________________________________________________________________
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff