Skip to content

Commit deeea82

Browse files
committed
Use lightweight mft::GeometryTGeo instead of full geometry
1 parent 2eb244c commit deeea82

7 files changed

+15
-22
lines changed

Modules/ITS/itsQCQualitySummary.json

-10
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,6 @@
9090
"geomPath": "./",
9191
"publishSummary1D": "0",
9292
"publishDetailedSummary": "0"
93-
},
94-
"grpGeomRequest" : {
95-
"geomRequest": "Aligned",
96-
"askGRPECS": "false",
97-
"askGRPLHCIF": "false",
98-
"askGRPMagField": "false",
99-
"askMatLUT": "false",
100-
"askTime": "false",
101-
"askOnceAllButField": "true",
102-
"needPropagatorD": "false"
10393
}
10494
},
10595
"ITSTrackTask" : {

Modules/MFT/include/MFT/QcMFTClusterTask.h

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ class QcMFTClusterTask /*final*/ : public TaskInterface // todo add back the "fi
101101
// dictionary
102102
const o2::itsmft::TopologyDictionary* mDict = nullptr;
103103

104+
o2::mft::GeometryTGeo* mGeom = nullptr;
104105
// where the geometry file is stored
105106
std::string mGeomPath;
106107

Modules/MFT/include/MFT/QcMFTTrackTask.h

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "Common/TH2Ratio.h"
3030
// O2
3131
#include "CommonConstants/LHCConstants.h"
32+
#include "MFTBase/GeometryTGeo.h"
3233

3334
using namespace o2::quality_control::core;
3435
using namespace o2::quality_control_modules::common;
@@ -57,6 +58,8 @@ class QcMFTTrackTask /*final*/ : public TaskInterface // todo add back the "fina
5758
void reset() override;
5859

5960
private:
61+
o2::mft::GeometryTGeo* mGeom = nullptr;
62+
6063
std::unique_ptr<TH1FRatio> mNumberOfTracksPerTF = nullptr;
6164
std::unique_ptr<TH1FRatio> mTrackNumberOfClusters = nullptr;
6265
std::unique_ptr<TH1FRatio> mCATrackNumberOfClusters = nullptr;

Modules/MFT/mft-clusters.json

-10
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,6 @@
4141
"timeBinSize" : "0.1",
4242
"ROFLengthInBC" : "198"
4343
},
44-
"grpGeomRequest" : {
45-
"geomRequest": "Aligned",
46-
"askGRPECS": "false",
47-
"askGRPLHCIF": "false",
48-
"askGRPMagField": "false",
49-
"askMatLUT": "false",
50-
"askTime": "false",
51-
"askOnceAllButField": "true",
52-
"needPropagatorD": "false"
53-
},
5444
"location" : "remote"
5545
}
5646
},

Modules/MFT/mft-tracks.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"TimeBinSize" : "0.1"
4242
},
4343
"grpGeomRequest" : {
44-
"geomRequest": "Aligned",
44+
"geomRequest": "None",
4545
"askGRPECS": "true",
4646
"askGRPLHCIF": "false",
4747
"askGRPMagField": "false",

Modules/MFT/src/QcMFTClusterTask.cxx

+5-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,11 @@ void QcMFTClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
248248
mDict = mDictPtr.get();
249249
ILOG(Info, Support) << "Dictionary loaded with size: " << mDict->getSize() << ENDM;
250250
}
251-
251+
if (!mGeom) {
252+
o2::mft::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::mft::GeometryTGeo>("MFT/Config/Geometry"));
253+
mGeom = o2::mft::GeometryTGeo::Instance();
254+
ILOG(Info, Support) << "GeometryTGeo loaded" << ENDM;
255+
}
252256
// normalisation for the summary histogram to TF
253257
mClusterOccupancySummary->Fill(-1, -1);
254258
mClusterOccupancy->Fill(-1);

Modules/MFT/src/QcMFTTrackTask.cxx

+5
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ void QcMFTTrackTask::startOfCycle()
208208

209209
void QcMFTTrackTask::monitorData(o2::framework::ProcessingContext& ctx)
210210
{
211+
if (!mGeom) {
212+
o2::mft::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::mft::GeometryTGeo>("MFT/Config/Geometry"));
213+
mGeom = o2::mft::GeometryTGeo::Instance();
214+
ILOG(Info, Support) << "GeometryTGeo loaded" << ENDM;
215+
}
211216
auto mNOrbitsPerTF = o2::base::GRPGeomHelper::instance().getNHBFPerTF();
212217

213218
// get the tracks

0 commit comments

Comments
 (0)