Skip to content

Commit fd51f65

Browse files
iravasenBarthelemy
authored andcommitted
[Important] Fix bug with geometry in ITS FHR task (#1705)
* [WIP] [Important] Fix bug with geometry in ITS FHR task DO NOT MERGE YET - TEST ONGOING * fixed bug in ITS FHR task and removed unused json param reading
1 parent 765df1d commit fd51f65

4 files changed

Lines changed: 2 additions & 16 deletions

File tree

Modules/ITS/include/ITS/ITSClusterTask.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,7 @@ class ITSClusterTask : public TaskInterface
128128
int mNRofs = 0;
129129
int nBCbins = 103;
130130
long int mTimestamp = -1;
131-
std::string mGeomPath = "./";
132131
TString xLabel;
133-
std::string mGeoTimestamp = "1640991600000";
134-
int mLocalGeometryFile = 1;
135132
int mDoPublishDetailedSummary = 0;
136133

137134
const int mNStaves[NLayer] = { 12, 16, 20, 24, 30, 42, 48 };

Modules/ITS/include/ITS/ITSFhrTask.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ class ITSFhrTask final : public TaskInterface
161161

162162
// Geometry decoder
163163
o2::its::GeometryTGeo* mGeom;
164-
std::string mGeomPath = "./";
165-
std::string mGeoTimestamp = "1640991600000";
166-
int mLocalGeometryFile = 1;
167164
};
168165
} // namespace o2::quality_control_modules::its
169166

Modules/ITS/src/ITSClusterTask.cxx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,11 +571,8 @@ void ITSClusterTask::createAllHistos()
571571

572572
void ITSClusterTask::getJsonParameters()
573573
{
574-
mLocalGeometryFile = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "isLocalGeometry", mLocalGeometryFile);
575-
mGeoTimestamp = o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "geomstamp", mGeoTimestamp);
576574
mNThreads = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "nThreads", mNThreads);
577575
nBCbins = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "nBCbins", nBCbins);
578-
mGeomPath = o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "geomPath", mGeomPath);
579576
mDoPublish1DSummary = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "publishSummary1D", mDoPublish1DSummary);
580577
std::string LayerConfig = o2::quality_control_modules::common::getFromConfig<std::string>(mCustomParameters, "layer", "0000000");
581578
mDoPublishDetailedSummary = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "publishDetailedSummary", mDoPublishDetailedSummary);

Modules/ITS/src/ITSFhrTask.cxx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,7 @@ void ITSFhrTask::initialize(o2::framework::InitContext& /*ctx*/)
112112
mDecoder->setNThreads(mNThreads);
113113
mDecoder->setUserDataOrigin(header::DataOrigin("DS")); // set user data origin in dpl
114114
mDecoder->setUserDataDescription(header::DataDescription("RAWDATA0"));
115-
mChipsBuffer.resize(mGeom->getNumberOfChips());
116-
117-
mGeom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G));
118-
const math_utils::Point3D<float> loc(0., 0., 0.);
115+
mChipsBuffer.resize(24120);
119116

120117
if (mLayer != -1) {
121118
// define the hitnumber, occupancy, errorcount array
@@ -401,6 +398,7 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
401398
{
402399
if (ctx.services().get<o2::framework::TimingInfo>().globalRunNumberChanged) {
403400
mGeom = o2::its::GeometryTGeo::Instance();
401+
mGeom->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::L2G));
404402
}
405403
// set timer
406404
std::chrono::time_point<std::chrono::high_resolution_clock> start;
@@ -729,9 +727,6 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
729727

730728
void ITSFhrTask::getParameters()
731729
{
732-
mLocalGeometryFile = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "isLocalGeometry", mLocalGeometryFile);
733-
mGeoTimestamp = o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "geomstamp", mGeoTimestamp);
734-
mGeomPath = o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "geomPath", mGeomPath);
735730
mNThreads = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "decoderThreads", mNThreads);
736731
mLayer = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "Layer", mLayer);
737732
mHitCutForCheck = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "HitNumberCut", mHitCutForCheck);

0 commit comments

Comments
 (0)