Merge pull request #7416 from HimanshuCERN/O2hsharma

phymanshu · web-flow · commit 69fd283e5a21 · 2021-11-04T15:05:58.000+01:00
FIT: add time-calibration command line option
diff --git a/Detectors/FIT/FT0/calibration/include/FT0Calibration/FT0ChannelTimeTimeSlotContainer.h b/Detectors/FIT/FT0/calibration/include/FT0Calibration/FT0ChannelTimeTimeSlotContainer.h
@@ -29,7 +29,7 @@ class FT0ChannelTimeTimeSlotContainer final
 {
 
   //ranges to be discussed
-  static constexpr int HISTOGRAM_RANGE = 200;
+  static constexpr int HISTOGRAM_RANGE = 2000;
   static constexpr unsigned int NUMBER_OF_HISTOGRAM_BINS = 2 * HISTOGRAM_RANGE;
 
   using BoostHistogramType = boost::histogram::histogram<std::tuple<boost::histogram::axis::integer<>,
@@ -43,6 +43,7 @@ class FT0ChannelTimeTimeSlotContainer final
   [[nodiscard]] int16_t getMeanGaussianFitValue(std::size_t channelID) const;
   void merge(FT0ChannelTimeTimeSlotContainer* prev);
   void print() const;
+  static int sGausFitBins;
 
  private:
   std::size_t mMinEntries;
diff --git a/Detectors/FIT/FT0/calibration/src/FT0ChannelTimeTimeSlotContainer.cxx b/Detectors/FIT/FT0/calibration/src/FT0ChannelTimeTimeSlotContainer.cxx
@@ -17,6 +17,8 @@
 
 using namespace o2::ft0;
 
+int FT0ChannelTimeTimeSlotContainer::sGausFitBins = 999; // NOT USED
+
 FT0ChannelTimeTimeSlotContainer::FT0ChannelTimeTimeSlotContainer(std::size_t minEntries)
   : mMinEntries(minEntries)
 {
@@ -65,21 +67,38 @@ int16_t FT0ChannelTimeTimeSlotContainer::getMeanGaussianFitValue(std::size_t cha
     return 0;
   }
   LOG(DEBUG) << " for channel " << int(channelID) << " entries " << mEntriesPerChannel[channelID];
+
   std::vector<double> channelHistogramData(NUMBER_OF_HISTOGRAM_BINS);
+
   std::vector<double> outputGaussianFitValues;
+  double binWidth = (HISTOGRAM_RANGE - (-HISTOGRAM_RANGE)) / NUMBER_OF_HISTOGRAM_BINS;
+  double minGausFitRange = 0;
+  double maxGausFitRange = 0;
+  double MaxValOfHistogram = 0.0;
+
   for (int iBin = 0; iBin < NUMBER_OF_HISTOGRAM_BINS; ++iBin) {
     channelHistogramData[iBin] = mHistogram.at(iBin, channelID);
   }
 
+  int maxElementIndex = std::max_element(channelHistogramData.begin(), channelHistogramData.end()) - channelHistogramData.begin();
+  int maxElement = *std::max_element(channelHistogramData.begin(), channelHistogramData.end());
+
+  // calculating the min & max range values to fit gaussian
+  minGausFitRange = (-HISTOGRAM_RANGE + (maxElementIndex - sGausFitBins) * binWidth + binWidth / 2.0);
+  maxGausFitRange = (-HISTOGRAM_RANGE + (maxElementIndex + sGausFitBins) * binWidth + binWidth / 2.0);
+
   double returnCode = math_utils::fitGaus<double>(NUMBER_OF_HISTOGRAM_BINS, channelHistogramData.data(),
-                                                  -HISTOGRAM_RANGE, HISTOGRAM_RANGE, outputGaussianFitValues);
+                                                  minGausFitRange, maxGausFitRange, outputGaussianFitValues);
+
+  MaxValOfHistogram = (-HISTOGRAM_RANGE + maxElementIndex * binWidth + binWidth / 2.0);
   if (returnCode < 0) {
     LOG(ERROR) << "Gaussian fit error!";
-    return 0;
+    return static_cast<int16_t>(std::round(MaxValOfHistogram));
   }
 
   return static_cast<int16_t>(std::round(outputGaussianFitValues[MEAN_VALUE_INDEX_IN_OUTPUT_VECTOR]));
 }
+
 void FT0ChannelTimeTimeSlotContainer::print() const
 {
   //QC will do that part
diff --git a/Detectors/FIT/FT0/calibration/testWorkflow/FT0Calibration-Workflow.cxx b/Detectors/FIT/FT0/calibration/testWorkflow/FT0Calibration-Workflow.cxx
@@ -10,10 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "FT0ChannelTimeCalibrationSpec.h"
+#include "FT0Calibration/FT0ChannelTimeTimeSlotContainer.h"
+
+using namespace o2::framework;
 
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 {
   //probably some option will be added
+  std::vector<o2::framework::ConfigParamSpec> options;
+  options.push_back(ConfigParamSpec{"time-calib-fitting-nbins", VariantType::Int, 2, {""}});
+  std::swap(workflowOptions, options);
 }
 
 #include "Framework/runDataProcessing.h"
@@ -22,6 +28,7 @@ using namespace o2::framework;
 WorkflowSpec defineDataProcessing(ConfigContext const& config)
 {
   WorkflowSpec workflow;
+  o2::ft0::FT0ChannelTimeTimeSlotContainer::sGausFitBins = config.options().get<int>("time-calib-fitting-nbins");
   workflow.emplace_back(o2::ft0::getFT0ChannelTimeCalibrationSpec());
   //add calib spec here...
   return workflow;
diff --git a/Detectors/FIT/FT0/calibration/testWorkflow/FT0ChannelTimeCalibration-Workflow.cxx b/Detectors/FIT/FT0/calibration/testWorkflow/FT0ChannelTimeCalibration-Workflow.cxx
@@ -10,10 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "FT0ChannelTimeCalibrationSpec.h"
+#include "FT0Calibration/FT0ChannelTimeTimeSlotContainer.h"
+
+using namespace o2::framework;
 
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 {
   //probably some option will be added
+  std::vector<o2::framework::ConfigParamSpec> options;
+  options.push_back(ConfigParamSpec{"time-calib-fitting-nbins", VariantType::Int, 2, {""}});
+  std::swap(workflowOptions, options);
 }
 
 #include "Framework/runDataProcessing.h"
@@ -22,6 +28,7 @@ using namespace o2::framework;
 WorkflowSpec defineDataProcessing(ConfigContext const& config)
 {
   WorkflowSpec workflow;
+  o2::ft0::FT0ChannelTimeTimeSlotContainer::sGausFitBins = config.options().get<int>("time-calib-fitting-nbins");
   workflow.emplace_back(o2::ft0::getFT0ChannelTimeCalibrationSpec());
   return workflow;
 }
diff --git a/Detectors/FIT/FT0/calibration/testWorkflow/FT0TFProcessor-Workflow.cxx b/Detectors/FIT/FT0/calibration/testWorkflow/FT0TFProcessor-Workflow.cxx
@@ -78,5 +78,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 
   WorkflowSpec workflow;
   workflow.emplace_back(dataProcessorSpec);
+
   return workflow;
 }
diff --git a/Detectors/FIT/FV0/calibration/include/FV0Calibration/FV0ChannelTimeTimeSlotContainer.h b/Detectors/FIT/FV0/calibration/include/FV0Calibration/FV0ChannelTimeTimeSlotContainer.h
@@ -30,7 +30,7 @@ class FV0ChannelTimeTimeSlotContainer final
 {
 
   //ranges to be discussed
-  static constexpr int HISTOGRAM_RANGE = 200;
+  static constexpr int HISTOGRAM_RANGE = 2000;
   static constexpr unsigned int NUMBER_OF_HISTOGRAM_BINS = 2 * HISTOGRAM_RANGE;
 
   using BoostHistogramType = boost::histogram::histogram<std::tuple<boost::histogram::axis::integer<>,
@@ -44,6 +44,7 @@ class FV0ChannelTimeTimeSlotContainer final
   [[nodiscard]] int16_t getMeanGaussianFitValue(std::size_t channelID) const;
   void merge(FV0ChannelTimeTimeSlotContainer* prev);
   void print() const;
+  static int sGausFitBins;
 
  private:
   std::size_t mMinEntries;
diff --git a/Detectors/FIT/FV0/calibration/src/FV0ChannelTimeTimeSlotContainer.cxx b/Detectors/FIT/FV0/calibration/src/FV0ChannelTimeTimeSlotContainer.cxx
@@ -17,6 +17,8 @@
 
 using namespace o2::fv0;
 
+int FV0ChannelTimeTimeSlotContainer::sGausFitBins = 999; // NOT USED
+
 FV0ChannelTimeTimeSlotContainer::FV0ChannelTimeTimeSlotContainer(std::size_t minEntries)
   : mMinEntries(minEntries)
 {
@@ -65,22 +67,41 @@ int16_t FV0ChannelTimeTimeSlotContainer::getMeanGaussianFitValue(std::size_t cha
   if (0 == mEntriesPerChannel[channelID]) {
     return 0;
   }
+  LOG(DEBUG) << " for channel " << int(channelID) << " entries " << mEntriesPerChannel[channelID];
+
+  std::vector<double> channelHistogramData(NUMBER_OF_HISTOGRAM_BINS, 0);
 
-  std::vector<double> channelHistogramData(NUMBER_OF_HISTOGRAM_BINS);
   std::vector<double> outputGaussianFitValues;
+  double binWidth = (HISTOGRAM_RANGE - (-HISTOGRAM_RANGE)) / NUMBER_OF_HISTOGRAM_BINS;
+  double minGausFitRange = 0;
+  double maxGausFitRange = 0;
+  double MaxValOfHistogram = 0.0;
+
   for (int iBin = 0; iBin < NUMBER_OF_HISTOGRAM_BINS; ++iBin) {
     channelHistogramData[iBin] = mHistogram.at(iBin, channelID);
   }
 
+  int maxElementIndex = std::max_element(channelHistogramData.begin(), channelHistogramData.end()) - channelHistogramData.begin();
+  int maxElement = *std::max_element(channelHistogramData.begin(), channelHistogramData.end());
+
+  // calculating the min & max range values to fit gaussian
+  minGausFitRange = (-HISTOGRAM_RANGE + (maxElementIndex - sGausFitBins) * binWidth + binWidth / 2.0);
+  maxGausFitRange = (-HISTOGRAM_RANGE + (maxElementIndex + sGausFitBins) * binWidth + binWidth / 2.0);
+
   double returnCode = math_utils::fitGaus<double>(NUMBER_OF_HISTOGRAM_BINS, channelHistogramData.data(),
-                                                  -HISTOGRAM_RANGE, HISTOGRAM_RANGE, outputGaussianFitValues);
+                                                  minGausFitRange, maxGausFitRange, outputGaussianFitValues);
+
+  MaxValOfHistogram = (-HISTOGRAM_RANGE + maxElementIndex * binWidth + binWidth / 2.0);
+
   if (returnCode < 0) {
     LOG(ERROR) << "Gaussian fit error!";
-    return 0;
+    return static_cast<int16_t>(std::round(MaxValOfHistogram));
+    //return 0;
   }
 
   return static_cast<int16_t>(std::round(outputGaussianFitValues[MEAN_VALUE_INDEX_IN_OUTPUT_VECTOR]));
 }
+
 void FV0ChannelTimeTimeSlotContainer::print() const
 {
   //QC will do that part
diff --git a/Detectors/FIT/FV0/calibration/workflow/FV0ChannelTimeCalibration-Workflow.cxx b/Detectors/FIT/FV0/calibration/workflow/FV0ChannelTimeCalibration-Workflow.cxx
@@ -10,10 +10,17 @@
 // or submit itself to any jurisdiction.
 
 #include "FV0ChannelTimeCalibrationSpec.h"
+#include "FV0Calibration/FV0ChannelTimeTimeSlotContainer.h"
+
+using namespace o2::framework;
 
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 {
+
   //probably some option will be added
+  std::vector<o2::framework::ConfigParamSpec> options;
+  options.push_back(ConfigParamSpec{"time-calib-fitting-nbins", VariantType::Int, 2, {""}});
+  std::swap(workflowOptions, options);
 }
 
 #include "Framework/runDataProcessing.h"
@@ -22,6 +29,7 @@ using namespace o2::framework;
 WorkflowSpec defineDataProcessing(ConfigContext const& config)
 {
   WorkflowSpec workflow;
+  o2::fv0::FV0ChannelTimeTimeSlotContainer::sGausFitBins = config.options().get<int>("time-calib-fitting-nbins");
   workflow.emplace_back(o2::fv0::getFV0ChannelTimeCalibrationSpec());
   return workflow;
 }

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,16 @@`
`10`	`10`	`// or submit itself to any jurisdiction.`
`11`	`11`
`12`	`12`	`#include "FT0ChannelTimeCalibrationSpec.h"`
	`13`	`+#include "FT0Calibration/FT0ChannelTimeTimeSlotContainer.h"`
	`14`	`+`
	`15`	`+using namespace o2::framework;`
`13`	`16`
`14`	`17`	`void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)`
`15`	`18`	`{`
`16`	`19`	`//probably some option will be added`
	`20`	`+ std::vector<o2::framework::ConfigParamSpec> options;`
	`21`	`+ options.push_back(ConfigParamSpec{"time-calib-fitting-nbins", VariantType::Int, 2, {""}});`
	`22`	`+ std::swap(workflowOptions, options);`
`17`	`23`	`}`
`18`	`24`
`19`	`25`	`#include "Framework/runDataProcessing.h"`
`@@ -22,6 +28,7 @@ using namespace o2::framework;`
`22`	`28`	`WorkflowSpec defineDataProcessing(ConfigContext const& config)`
`23`	`29`	`{`
`24`	`30`	`WorkflowSpec workflow;`
	`31`	`+ o2::ft0::FT0ChannelTimeTimeSlotContainer::sGausFitBins = config.options().get<int>("time-calib-fitting-nbins");`
`25`	`32`	`workflow.emplace_back(o2::ft0::getFT0ChannelTimeCalibrationSpec());`
`26`	`33`	`return workflow;`
`27`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)`
`78`	`78`
`79`	`79`	`WorkflowSpec workflow;`
`80`	`80`	`workflow.emplace_back(dataProcessorSpec);`
	`81`	`+`
`81`	`82`	`return workflow;`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,17 @@`
`10`	`10`	`// or submit itself to any jurisdiction.`
`11`	`11`
`12`	`12`	`#include "FV0ChannelTimeCalibrationSpec.h"`
	`13`	`+#include "FV0Calibration/FV0ChannelTimeTimeSlotContainer.h"`
	`14`	`+`
	`15`	`+using namespace o2::framework;`
`13`	`16`
`14`	`17`	`void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)`
`15`	`18`	`{`
	`19`	`+`
`16`	`20`	`//probably some option will be added`
	`21`	`+ std::vector<o2::framework::ConfigParamSpec> options;`
	`22`	`+ options.push_back(ConfigParamSpec{"time-calib-fitting-nbins", VariantType::Int, 2, {""}});`
	`23`	`+ std::swap(workflowOptions, options);`
`17`	`24`	`}`
`18`	`25`
`19`	`26`	`#include "Framework/runDataProcessing.h"`
`@@ -22,6 +29,7 @@ using namespace o2::framework;`
`22`	`29`	`WorkflowSpec defineDataProcessing(ConfigContext const& config)`
`23`	`30`	`{`
`24`	`31`	`WorkflowSpec workflow;`
	`32`	`+ o2::fv0::FV0ChannelTimeTimeSlotContainer::sGausFitBins = config.options().get<int>("time-calib-fitting-nbins");`
`25`	`33`	`workflow.emplace_back(o2::fv0::getFV0ChannelTimeCalibrationSpec());`
`26`	`34`	`return workflow;`
`27`	`35`	`}`