Skip to content

Commit 20e5992

Browse files
committed
Use lightweight its::GeometryTGeo instead of full geometry
1 parent 33ced9f commit 20e5992

File tree

5 files changed

+5
-38
lines changed

5 files changed

+5
-38
lines changed

Modules/ITS/itsCluster.json

-10
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@
4343
"geomPath": "./",
4444
"publishSummary1D": "0",
4545
"publishDetailedSummary": "1"
46-
},
47-
"grpGeomRequest" : {
48-
"geomRequest": "Aligned",
49-
"askGRPECS": "false",
50-
"askGRPLHCIF": "false",
51-
"askGRPMagField": "false",
52-
"askMatLUT": "false",
53-
"askTime": "false",
54-
"askOnceAllButField": "false",
55-
"needPropagatorD": "false"
5646
}
5747
}
5848
},

Modules/ITS/itsFhr.json

-10
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,6 @@
5252
"PhysicalOccupancyIB": "1.7e-3",
5353
"PhysicalOccupancyOB": "4.3e-5",
5454
"IgnoreRampUpData": "true"
55-
},
56-
"grpGeomRequest" : {
57-
"geomRequest": "Aligned",
58-
"askGRPECS": "false",
59-
"askGRPLHCIF": "false",
60-
"askGRPMagField": "false",
61-
"askMatLUT": "false",
62-
"askTime": "false",
63-
"askOnceAllButField": "false",
64-
"needPropagatorD": "false"
6555
}
6656
}
6757
},

Modules/ITS/itsQCQualitySummary.json

-10
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,6 @@
6868
"DoHitmapFilter": "1",
6969
"PhysicalOccupancyIB": "1.7e-3",
7070
"PhysicalOccupancyOB": "4.3e-5"
71-
},
72-
"grpGeomRequest" : {
73-
"geomRequest": "Aligned",
74-
"askGRPECS": "false",
75-
"askGRPLHCIF": "false",
76-
"askGRPMagField": "false",
77-
"askMatLUT": "false",
78-
"askTime": "false",
79-
"askOnceAllButField": "true",
80-
"needPropagatorD": "false"
8171
}
8272
},
8373
"ITSClusterTask": {

Modules/ITS/src/ITSClusterTask.cxx

+3-6
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,16 @@ void ITSClusterTask::startOfCycle()
115115
void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
116116
{
117117

118-
if (mGeom == nullptr) {
119-
ILOG(Warning, Devel) << "Created new instance of mGeom" << ENDM;
120-
mGeom = o2::its::GeometryTGeo::Instance();
121-
mGeom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G));
122-
}
123-
124118
if (mTimestamp == -1) { // get dict from ccdb
125119
mTimestamp = std::stol(o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "dicttimestamp", "0"));
126120
long int ts = mTimestamp ? mTimestamp : ctx.services().get<o2::framework::TimingInfo>().creation;
127121
ILOG(Debug, Devel) << "Getting dictionary from ccdb - timestamp: " << ts << ENDM;
128122
std::map<std::string, std::string> metadata;
129123
mDict = TaskInterface::retrieveConditionAny<o2::itsmft::TopologyDictionary>("ITS/Calib/ClusterDictionary", metadata, ts);
130124
ILOG(Debug, Devel) << "Dictionary size: " << mDict->getSize() << ENDM;
125+
o2::its::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::its::GeometryTGep>("ITS/Config/Geometry", metadata, ts));
126+
mGeom = o2::its::GeometryTGeo::Instance();
127+
ILOG(Debug, Devel) << "Loaded new instance of mGeom" << ENDM;
131128
}
132129

133130
std::chrono::time_point<std::chrono::high_resolution_clock> start;

Modules/ITS/src/ITSFhrTask.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,9 @@ void ITSFhrTask::startOfCycle() { ILOG(Debug, Devel) << "startOfCycle" << ENDM;
389389
void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
390390
{
391391
if (mGeom == nullptr) {
392-
ILOG(Warning, Devel) << "Created new instance of mGeom" << ENDM;
392+
o2::its::GeometryTGeo::adopt(TaskInterface::retrieveConditionAny<o2::its::GeometryTGep>("ITS/Config/Geometry", metadata, ts));
393393
mGeom = o2::its::GeometryTGeo::Instance();
394-
mGeom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G));
394+
ILOG(Debug, Devel) << "Loaded new instance of mGeom" << ENDM;
395395
}
396396
// set timer
397397
std::chrono::time_point<std::chrono::high_resolution_clock> start;

0 commit comments

Comments
 (0)