**************************************************************************/
/* $Id$ */
+//-----------------------------------------------------------------------------
/// \class AliMUONReconstructor
///
/// Implementation of AliReconstructor for MUON subsystem.
///
/// SIMPLEFIT : use the AliMUONClusterFinderSimpleFit clusterizer
///
-/// AZ : use the AliMUONClusterFinderAZ clusterizer (default)
+/// MLEM : another implementation of AZ, where preclustering is external (default)
+/// MLEMV3 : 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
///
/// NOCLUSTERING : bypass completely the clustering stage
///
-/// NOSTATUSMAP : disable the computation and usage of the pad status map. Only
-/// for debug !
-///
/// NOLOCALRECONSTRUCTION : for debug, to disable local reconstruction (and hence
/// "recover" old behavior)
///
/// TRIGGERDISABLE : disable the treatment of MUON trigger
///
+/// DIGITSTOREV1 : use the V1 implementation of the digitstore
+/// DIGITSTOREV2R : use the V2R implementation of the digitstore
+///
/// \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 "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 "AliMUONTracker.h"
#include "AliMUONVTrackStore.h"
#include "AliMUONTriggerChamberEff.h"
#include "AliMUONTriggerCrateStore.h"
#include "AliMUONTriggerStoreV1.h"
#include "AliMUONVClusterFinder.h"
+#include "AliMUONRecoParam.h"
+#include "AliMpCDB.h"
#include "AliRawReader.h"
-#include "AliMUONStopwatchGroup.h"
-#include "AliMUONStopwatchGroupElement.h"
+#include "AliCodeTimer.h"
#include <Riostream.h>
#include <TClonesArray.h>
#include <TString.h>
ClassImp(AliMUONReconstructor)
/// \endcond
+AliMUONRecoParam* AliMUONReconstructor::fgRecoParam = 0x0; // reconstruction parameters
+
//_____________________________________________________________________________
AliMUONReconstructor::AliMUONReconstructor() :
AliReconstructor(),
fClusterStore(0x0),
fTriggerStore(0x0),
fTrackStore(0x0),
-fTrigChamberEff(0x0),
-fTimers(new AliMUONStopwatchGroup)
+fTrigChamberEff(0x0)
{
/// normal ctor
+
+ // Load mapping
+ if ( ! AliMpCDB::LoadDDLStore() ) {
+ AliFatal("Could not access mapping from OCDB !");
+ }
+
+ // Load geometry data
fTransformer->LoadGeometryData();
+
+ // initialize reconstruction parameters in not already done
+ if (!fgRecoParam) {
+ AliWarning("Reconstruction parameters not initialized - Use default one");
+ fgRecoParam = AliMUONRecoParam::GetLowFluxParam();
+ }
+
}
//_____________________________________________________________________________
delete fTriggerStore;
delete fTrackStore;
delete fTrigChamberEff;
- AliInfo("Timers:");
- fTimers->Print();
- delete fTimers;
+}
+
+//_____________________________________________________________________________
+void AliMUONReconstructor::SetRecoParam(AliMUONRecoParam *param)
+{
+ /// set reconstruction parameters
+
+ // remove existing parameters
+ if (fgRecoParam) {
+ cout<<"AliMUONReconstructor::SetRecoParam: Reconstruction parameters already initialized - overwrite them"<<endl;
+ delete fgRecoParam;
+ }
+
+ fgRecoParam = param;
}
//_____________________________________________________________________________
{
CreateCalibrator();
}
- AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()));
+ AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()))
fDigitCalibrator->Calibrate(digitStore);
}
{
/// Creates clusters from digits.
- TString sopt(GetOption());
+ TString sopt(fgRecoParam->GetClusteringMode());
sopt.ToUpper();
if ( sopt.Contains("NOCLUSTERING") ) return;
- if (!fClusterReconstructor)
- {
- CreateClusterReconstructor();
- }
+ if (!fClusterReconstructor) CreateClusterReconstructor();
+
+ // if the required clustering mode does not exist
+ if (!fClusterReconstructor) return;
- AliMUONStopwatchGroupElement timer(fTimers,"MUON",Form("%s::Digits2Clusters(const AliMUONVDigitStore&,AliMUONVClusterStore&)",
- fClusterReconstructor->ClassName()));
+ AliCodeTimerAuto(Form("%s::Digits2Clusters(const AliMUONVDigitStore&,AliMUONVClusterStore&)",
+ fClusterReconstructor->ClassName()))
fClusterReconstructor->Digits2Clusters(digitStore,clusterStore);
}
/// Return (and create if necessary) the cluster container
if (!fClusterStore)
{
- fClusterStore = new AliMUONClusterStoreV1;
+ fClusterStore = new AliMUONClusterStoreV2;
}
return fClusterStore;
}
{
/// 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();
}
}
/// Create (and create if necessary) the digit maker
if (fDigitMaker) return;
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateDigitMaker()");
+ AliCodeTimerAuto("")
fDigitMaker = new AliMUONDigitMaker;
}
/// Return (and create if necessary) the trigger circuit object
if (fTriggerCircuit) return;
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateTriggerCircuit()");
+ AliCodeTimerAuto("")
fTriggerCircuit = new AliMUONTriggerCircuit(fTransformer);
/// Create (and create if necessary) the trigger chamber efficiency class
if (fTrigChamberEff) return;
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateTriggerChamberEff()");
+ AliCodeTimerAuto("")
fTrigChamberEff = new AliMUONTriggerChamberEff(fTransformer,fDigitMaker,kTRUE);
//fTrigChamberEff->SetDebugLevel(1);
//_____________________________________________________________________________
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();
CreateTriggerChamberEff();
- AliLoader* loader = runLoader->GetDetectorLoader("MUON");
- if (!loader)
- {
- AliError("Cannot get MUONLoader, so cannot create MUONTracker");
- return 0x0;
- }
- AliMUONTracker* tracker = new AliMUONTracker(loader,fDigitMaker,fTransformer,fTriggerCircuit,fTrigChamberEff);
- tracker->SetOption(GetOption());
+ AliMUONTracker* tracker = new AliMUONTracker(fDigitMaker,fTransformer,fTriggerCircuit,fTrigChamberEff);
return tracker;
}
void
AliMUONReconstructor::CreateClusterReconstructor() const
{
- /// Create cluster reconstructor, depending on GetOption()
+ /// Create cluster reconstructor, depending on clustering mode set in RecoParam
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateClusterReconstructor()");
+ AliCodeTimerAuto("")
AliDebug(1,"");
AliMUONVClusterFinder* clusterFinder(0x0);
- TString opt(GetOption());
+ TString opt(fgRecoParam->GetClusteringMode());
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,"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;
+ AliError(Form("clustering mode \"%s\" does not exist",opt.Data()));
+ return;
}
- if ( clusterFinder )
- {
- AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName()));
- }
+ AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName()));
fClusterReconstructor = new AliMUONClusterReconstructor(clusterFinder,fTransformer);
}
{
/// Create the calibrator
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::CreateCalibrator()");
+ AliCodeTimerAuto("")
Int_t runNumber = AliCDBManager::Instance()->GetRun();
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);
+
+ fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData);
}
//_____________________________________________________________________________
/// 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;
}
{
/// Write the trigger and cluster information into TreeR
- AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONReconstructor::FillTreeR()");
+ AliCodeTimerAuto("")
AliDebug(1,"");
}
}
-//_____________________________________________________________________________
-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()));
- }
+ ConvertDigits(rawReader,DigitStore(),TriggerStore());
+ Clusterize(*(DigitStore()),*(ClusterStore()));
FillTreeR(TriggerStore(),ClusterStore(),*clustersTree);
}
-//_____________________________________________________________________________
-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();
- }
-}
-
//_____________________________________________________________________________
void
AliMUONReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const
/// This method is called by AliReconstruction if HasLocalReconstruction()==kTRUE
/// AND HasDigitConversion()==kTRUE
+ AliCodeTimerAuto("")
+
AliDebug(1,"");
if (!digitsTree || !clustersTree)
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff