FIT PostProc: bugfix for incorrect types in dynamic cast (#1716)

afurs · web-flow · commit 27ff57606855 · 2023-04-12T08:17:55.000+02:00
diff --git a/Modules/FIT/FDD/src/PostProcTask.cxx b/Modules/FIT/FDD/src/PostProcTask.cxx
@@ -234,7 +234,7 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)
     ILOG(Error) << "MO \"ChannelDataBits\" NOT retrieved!!!" << ENDM;
   }
   auto moStatChannelID = mDatabase->retrieveMO(mPathDigitQcTask, "StatChannelID", t.timestamp, t.activity);
-  auto hStatChannelID = moStatChannelID ? dynamic_cast<TH2F*>(moStatChannelID->getObject()) : nullptr;
+  auto hStatChannelID = moStatChannelID ? dynamic_cast<TH1F*>(moStatChannelID->getObject()) : nullptr;
   if (!hStatChannelID) {
     ILOG(Error) << "MO \"StatChannelID\" NOT retrieved!!!" << ENDM;
   }
@@ -306,13 +306,13 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)
   }
 
   auto mo3 = mDatabase->retrieveMO(mPathDigitQcTask, "AmpPerChannel", t.timestamp, t.activity);
-  auto hAmpPerChannel = mo3 ? dynamic_cast<TH2D*>(mo3->getObject()) : nullptr;
+  auto hAmpPerChannel = mo3 ? dynamic_cast<TH2F*>(mo3->getObject()) : nullptr;
   if (!hAmpPerChannel) {
     ILOG(Error) << "MO \"AmpPerChannel\" NOT retrieved!!!"
                 << ENDM;
   }
   auto mo4 = mDatabase->retrieveMO(mPathDigitQcTask, "TimePerChannel", t.timestamp, t.activity);
-  auto hTimePerChannel = mo4 ? dynamic_cast<TH2D*>(mo4->getObject()) : nullptr;
+  auto hTimePerChannel = mo4 ? dynamic_cast<TH2F*>(mo4->getObject()) : nullptr;
   if (!hTimePerChannel) {
     ILOG(Error) << "MO \"TimePerChannel\" NOT retrieved!!!"
                 << ENDM;
diff --git a/Modules/FIT/FT0/src/PostProcTask.cxx b/Modules/FIT/FT0/src/PostProcTask.cxx
@@ -234,7 +234,7 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)
     ILOG(Error) << "MO \"ChannelDataBits\" NOT retrieved!!!" << ENDM;
   }
   auto moStatChannelID = mDatabase->retrieveMO(mPathDigitQcTask, "StatChannelID", t.timestamp, t.activity);
-  auto hStatChannelID = moStatChannelID ? dynamic_cast<TH2F*>(moStatChannelID->getObject()) : nullptr;
+  auto hStatChannelID = moStatChannelID ? dynamic_cast<TH1F*>(moStatChannelID->getObject()) : nullptr;
   if (!hStatChannelID) {
     ILOG(Error) << "MO \"StatChannelID\" NOT retrieved!!!" << ENDM;
   }
@@ -306,13 +306,13 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)
   }
 
   auto mo3 = mDatabase->retrieveMO(mPathDigitQcTask, "AmpPerChannel", t.timestamp, t.activity);
-  auto hAmpPerChannel = mo3 ? dynamic_cast<TH2D*>(mo3->getObject()) : nullptr;
+  auto hAmpPerChannel = mo3 ? dynamic_cast<TH2F*>(mo3->getObject()) : nullptr;
   if (!hAmpPerChannel) {
     ILOG(Error) << "MO \"AmpPerChannel\" NOT retrieved!!!"
                 << ENDM;
   }
   auto mo4 = mDatabase->retrieveMO(mPathDigitQcTask, "TimePerChannel", t.timestamp, t.activity);
-  auto hTimePerChannel = mo4 ? dynamic_cast<TH2D*>(mo4->getObject()) : nullptr;
+  auto hTimePerChannel = mo4 ? dynamic_cast<TH2F*>(mo4->getObject()) : nullptr;
   if (!hTimePerChannel) {
     ILOG(Error) << "MO \"TimePerChannel\" NOT retrieved!!!"
                 << ENDM;
diff --git a/Modules/FIT/FV0/src/PostProcTask.cxx b/Modules/FIT/FV0/src/PostProcTask.cxx
@@ -234,7 +234,7 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)
     ILOG(Error) << "MO \"ChannelDataBits\" NOT retrieved!!!" << ENDM;
   }
   auto moStatChannelID = mDatabase->retrieveMO(mPathDigitQcTask, "StatChannelID", t.timestamp, t.activity);
-  auto hStatChannelID = moStatChannelID ? dynamic_cast<TH2F*>(moStatChannelID->getObject()) : nullptr;
+  auto hStatChannelID = moStatChannelID ? dynamic_cast<TH1F*>(moStatChannelID->getObject()) : nullptr;
   if (!hStatChannelID) {
     ILOG(Error) << "MO \"StatChannelID\" NOT retrieved!!!" << ENDM;
   }
@@ -306,13 +306,13 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)
   }
 
   auto mo3 = mDatabase->retrieveMO(mPathDigitQcTask, "AmpPerChannel", t.timestamp, t.activity);
-  auto hAmpPerChannel = mo3 ? dynamic_cast<TH2D*>(mo3->getObject()) : nullptr;
+  auto hAmpPerChannel = mo3 ? dynamic_cast<TH2F*>(mo3->getObject()) : nullptr;
   if (!hAmpPerChannel) {
     ILOG(Error) << "MO \"AmpPerChannel\" NOT retrieved!!!"
                 << ENDM;
   }
   auto mo4 = mDatabase->retrieveMO(mPathDigitQcTask, "TimePerChannel", t.timestamp, t.activity);
-  auto hTimePerChannel = mo4 ? dynamic_cast<TH2D*>(mo4->getObject()) : nullptr;
+  auto hTimePerChannel = mo4 ? dynamic_cast<TH2F*>(mo4->getObject()) : nullptr;
   if (!hTimePerChannel) {
     ILOG(Error) << "MO \"TimePerChannel\" NOT retrieved!!!"
                 << ENDM;

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)`
`234`	`234`	`ILOG(Error) << "MO \"ChannelDataBits\" NOT retrieved!!!" << ENDM;`
`235`	`235`	`}`
`236`	`236`	`auto moStatChannelID = mDatabase->retrieveMO(mPathDigitQcTask, "StatChannelID", t.timestamp, t.activity);`
`237`		`- auto hStatChannelID = moStatChannelID ? dynamic_cast<TH2F*>(moStatChannelID->getObject()) : nullptr;`
	`237`	`+ auto hStatChannelID = moStatChannelID ? dynamic_cast<TH1F*>(moStatChannelID->getObject()) : nullptr;`
`238`	`238`	`if (!hStatChannelID) {`
`239`	`239`	`ILOG(Error) << "MO \"StatChannelID\" NOT retrieved!!!" << ENDM;`
`240`	`240`	`}`
`@@ -306,13 +306,13 @@ void PostProcTask::update(Trigger t, framework::ServiceRegistryRef)`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`auto mo3 = mDatabase->retrieveMO(mPathDigitQcTask, "AmpPerChannel", t.timestamp, t.activity);`
`309`		`- auto hAmpPerChannel = mo3 ? dynamic_cast<TH2D*>(mo3->getObject()) : nullptr;`
	`309`	`+ auto hAmpPerChannel = mo3 ? dynamic_cast<TH2F*>(mo3->getObject()) : nullptr;`
`310`	`310`	`if (!hAmpPerChannel) {`
`311`	`311`	`ILOG(Error) << "MO \"AmpPerChannel\" NOT retrieved!!!"`
`312`	`312`	`<< ENDM;`
`313`	`313`	`}`
`314`	`314`	`auto mo4 = mDatabase->retrieveMO(mPathDigitQcTask, "TimePerChannel", t.timestamp, t.activity);`
`315`		`- auto hTimePerChannel = mo4 ? dynamic_cast<TH2D*>(mo4->getObject()) : nullptr;`
	`315`	`+ auto hTimePerChannel = mo4 ? dynamic_cast<TH2F*>(mo4->getObject()) : nullptr;`
`316`	`316`	`if (!hTimePerChannel) {`
`317`	`317`	`ILOG(Error) << "MO \"TimePerChannel\" NOT retrieved!!!"`
`318`	`318`	`<< ENDM;`