Skip to content

Commit 2ac8b44

Browse files
shahor02shahor02
committed
Adapt eve-export to GRPGeomHelper
1 parent 76a3f8d commit 2ac8b44

6 files changed

Lines changed: 108 additions & 85 deletions

File tree

‎EventVisualisation/Workflow/include/EveWorkflow/DetectorData.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DetectorData
4747

4848
const o2::itsmft::TopologyDictionary* mITSDict = nullptr;
4949
const o2::itsmft::TopologyDictionary* mMFTDict = nullptr;
50-
std::unique_ptr<EveConfiguration> mConfig;
50+
EveConfiguration mConfig{};
5151
std::unique_ptr<o2::trd::GeometryFlat> mTrdGeo;
5252
};
5353

‎EventVisualisation/Workflow/include/EveWorkflow/EveWorkflowHelper.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,9 @@ class EveWorkflowHelper
195195
Bracket mTimeBracket;
196196
Bracket mEtaBracket;
197197
bool mPrimaryVertexMode;
198-
o2::globaltracking::RecoContainer mRecoCont;
199-
o2::globaltracking::RecoContainer& getRecoContainer() { return mRecoCont; }
198+
const o2::globaltracking::RecoContainer* mRecoCont = nullptr;
199+
const o2::globaltracking::RecoContainer* getRecoContainer() const { return mRecoCont; }
200+
void setRecoContainer(const o2::globaltracking::RecoContainer* rc) { mRecoCont = rc; }
200201
TracksSet mTrackSet;
201202
o2::event_visualisation::VisualisationEvent mEvent;
202203
std::unordered_map<GID, std::size_t> mTotalTracks;

‎EventVisualisation/Workflow/include/EveWorkflow/O2DPLDisplay.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include "ReconstructionDataFormats/GlobalTrackID.h"
2020
#include "DataFormatsGlobalTracking/RecoContainer.h"
21+
#include "DetectorsBase/GRPGeomHelper.h"
2122
#include "EveWorkflow/DetectorData.h"
2223
#include "Framework/Task.h"
2324
#include <memory>
@@ -51,12 +52,14 @@ class O2DPLDisplaySpec : public o2::framework::Task
5152

5253
O2DPLDisplaySpec(bool useMC, o2::dataformats::GlobalTrackID::mask_t trkMask,
5354
o2::dataformats::GlobalTrackID::mask_t clMask,
54-
std::shared_ptr<o2::globaltracking::DataRequest> dataRequest, const std::string& jsonPath, const std::string& ext,
55+
std::shared_ptr<o2::globaltracking::DataRequest> dataRequest,
56+
std::shared_ptr<o2::base::GRPGeomRequest> gr,
57+
const std::string& jsonPath, const std::string& ext,
5558
std::chrono::milliseconds timeInterval, int numberOfFiles, int numberOfTracks,
5659
bool eveHostNameMatch, int minITSTracks, int minTracks, bool filterITSROF, bool filterTime,
5760
const EveWorkflowHelper::Bracket& timeBracket, bool removeTPCEta,
5861
const EveWorkflowHelper::Bracket& etaBracket, bool trackSorting, int onlyNthEvent, bool primaryVertex, int maxPrimaryVertices)
59-
: mUseMC(useMC), mTrkMask(trkMask), mClMask(clMask), mDataRequest(dataRequest), mJsonPath(jsonPath), mExt(ext), mTimeInterval(timeInterval), mNumberOfFiles(numberOfFiles), mNumberOfTracks(numberOfTracks), mEveHostNameMatch(eveHostNameMatch), mMinITSTracks(minITSTracks), mMinTracks(minTracks), mFilterITSROF(filterITSROF), mFilterTime(filterTime), mTimeBracket(timeBracket), mRemoveTPCEta(removeTPCEta), mEtaBracket(etaBracket), mTrackSorting(trackSorting), mOnlyNthEvent(onlyNthEvent), mPrimaryVertexMode(primaryVertex), mMaxPrimaryVertices(maxPrimaryVertices)
62+
: mUseMC(useMC), mTrkMask(trkMask), mClMask(clMask), mDataRequest(dataRequest), mGGCCDBRequest(gr), mJsonPath(jsonPath), mExt(ext), mTimeInterval(timeInterval), mNumberOfFiles(numberOfFiles), mNumberOfTracks(numberOfTracks), mEveHostNameMatch(eveHostNameMatch), mMinITSTracks(minITSTracks), mMinTracks(minTracks), mFilterITSROF(filterITSROF), mFilterTime(filterTime), mTimeBracket(timeBracket), mRemoveTPCEta(removeTPCEta), mEtaBracket(etaBracket), mTrackSorting(trackSorting), mOnlyNthEvent(onlyNthEvent), mPrimaryVertexMode(primaryVertex), mMaxPrimaryVertices(maxPrimaryVertices)
6063

6164
{
6265
this->mTimeStamp = std::chrono::high_resolution_clock::now() - timeInterval; // first run meets condition
@@ -95,6 +98,7 @@ class O2DPLDisplaySpec : public o2::framework::Task
9598
o2::dataformats::GlobalTrackID::mask_t mClMask;
9699
DetectorData mData;
97100
std::shared_ptr<o2::globaltracking::DataRequest> mDataRequest;
101+
std::shared_ptr<o2::base::GRPGeomRequest> mGGCCDBRequest;
98102
};
99103

100104
} // namespace o2::event_visualisation

‎EventVisualisation/Workflow/src/DetectorData.cxx‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "MCHTracking/TrackExtrap.h"
2727
#include "ReconstructionDataFormats/GlobalTrackID.h"
2828
#include "DetectorsCommonDataFormats/DetectorNameConf.h"
29+
#include "DetectorsBase/GRPGeomHelper.h"
2930

3031
using namespace o2::event_visualisation;
3132
using namespace o2::framework;
@@ -36,19 +37,16 @@ using namespace o2::trd;
3637

3738
void DetectorData::init()
3839
{
39-
const auto grp = o2::parameters::GRPObject::loadFrom();
40-
o2::base::GeometryManager::loadGeometry();
41-
o2::base::Propagator::initFieldFromGRP();
42-
mConfig.reset(new EveConfiguration);
43-
mConfig->configGRP.solenoidBz = o2::base::Propagator::Instance()->getNominalBz();
44-
mConfig->configGRP.continuousMaxTimeBin = grp->isDetContinuousReadOut(o2::detectors::DetID::TPC) ? -1 : 0; // Number of timebins in timeframe if continuous, 0 otherwise
45-
mConfig->ReadConfigurableParam();
40+
const auto grp = o2::base::GRPGeomHelper::instance().getGRPECS();
41+
mConfig.configGRP.solenoidBz = o2::base::Propagator::Instance()->getNominalBz();
42+
mConfig.configGRP.continuousMaxTimeBin = grp->isDetContinuousReadOut(o2::detectors::DetID::TPC) ? -1 : 0; // Number of timebins in timeframe if continuous, 0 otherwise
43+
mConfig.ReadConfigurableParam();
4644

4745
auto gm = o2::trd::Geometry::instance();
4846
gm->createPadPlaneArray();
4947
gm->createClusterMatrixArray();
5048
mTrdGeo.reset(new o2::trd::GeometryFlat(*gm));
51-
mConfig->configCalib.trdGeometry = mTrdGeo.get();
49+
mConfig.configCalib.trdGeometry = mTrdGeo.get();
5250

5351
o2::tof::Geo::Init();
5452

@@ -64,11 +62,11 @@ void DetectorData::init()
6462
void DetectorData::setITSDict(const o2::itsmft::TopologyDictionary* d)
6563
{
6664
mITSDict = d;
67-
mConfig->configCalib.itsPatternDict = d;
65+
mConfig.configCalib.itsPatternDict = d;
6866
}
6967

7068
void DetectorData::setMFTDict(const o2::itsmft::TopologyDictionary* d)
7169
{
7270
mMFTDict = d;
73-
mConfig->configCalib.mftPatternDict = d;
71+
mConfig.configCalib.mftPatternDict = d;
7472
}

0 commit comments

Comments
 (0)