Added fdd coincidence mode and threshold calibration to FIT configuration object

Author: wpierozak

DataFormats/Detectors/FIT/common/include/DataFormatsFIT/Configuration.h

@@ -64,6 +64,7 @@ struct PmConfig {
   uint8_t orGate{config_helpers::DefaultValue};
   uint16_t trgChargeHighLevel{config_helpers::DefaultValue};
   uint16_t trgChargeLowLevel{config_helpers::DefaultValue};
+  bool fddCoincidenceMode{config_helpers::DefaultValue};
   bool operator==(const PmConfig&) const = default;
   ClassDefNV(PmConfig, 1);
 };
@@ -77,6 +78,7 @@ struct ChannelsConfig {
   uint16_t adcDelays[NChannels];
   uint16_t rangeCorrectionAdc0[NChannels];
   uint16_t rangeCorrectionAdc1[NChannels];
+  uint16_t thresholdCalibration[NChannels];
   bool channelMaskData[NChannels];
   bool channelMaskTriggers[NChannels];
 
@@ -91,6 +93,7 @@ struct ChannelsConfig {
     config_helpers::fillDefaultArray(rangeCorrectionAdc1);
     config_helpers::fillDefaultArray(channelMaskData);
     config_helpers::fillDefaultArray(channelMaskTriggers);
+    config_helpers::fillDefaultArray(thresholdCalibration);
   }
 
   template <typename T>

Detectors/FIT/FDD/dcsmonitoring/macros/fdd-fee-config.json

@@ -53,6 +53,7 @@ void fetchFddFeeConfig(const std::string ccdbUrl = "http://alice-ccdb.cern.ch",
   rapidjson::Value rangeCorrectionAdc1(rapidjson::kArrayType);
   rapidjson::Value channelMaskData(rapidjson::kArrayType);
   rapidjson::Value channelMaskTriggers(rapidjson::kArrayType);
+  rapidjson::Value thresholdCalibration(rapidjson::kArrayType);
 
   for (int i = 0; i < o2::fdd::FddFeeConfiguration::NChannels; ++i) {
     timeAligments.PushBack(config->channels.timeAligments[i], allocator);
@@ -64,6 +65,7 @@ void fetchFddFeeConfig(const std::string ccdbUrl = "http://alice-ccdb.cern.ch",
     rangeCorrectionAdc1.PushBack(config->channels.rangeCorrectionAdc1[i], allocator);
     channelMaskData.PushBack(config->channels.channelMaskData[i], allocator);
     channelMaskTriggers.PushBack(config->channels.channelMaskTriggers[i], allocator);
+    thresholdCalibration.PushBack(config->channels.thresholdCalibration[i], allocator);
   }
 
   channels.AddMember("time_aligments", timeAligments, allocator);
@@ -75,6 +77,7 @@ void fetchFddFeeConfig(const std::string ccdbUrl = "http://alice-ccdb.cern.ch",
   channels.AddMember("range_correction_adc1", rangeCorrectionAdc1, allocator);
   channels.AddMember("channel_mask_data", channelMaskData, allocator);
   channels.AddMember("channel_mask_triggers", channelMaskTriggers, allocator);
+  channels.AddMember("threshold_calibration", thresholdCalibration, allocator);
   doc.AddMember("channels", channels, allocator);
 
   rapidjson::Value tcm(rapidjson::kObjectType);

Detectors/FIT/FDD/dcsmonitoring/macros/fetchFddFeeConfig.C

@@ -53,6 +53,7 @@ void fetchFt0FeeConfig(const std::string ccdbUrl = "http://alice-ccdb.cern.ch",
   rapidjson::Value rangeCorrectionAdc1(rapidjson::kArrayType);
   rapidjson::Value channelMaskData(rapidjson::kArrayType);
   rapidjson::Value channelMaskTriggers(rapidjson::kArrayType);
+  rapidjson::Value thresholdCalibration(rapidjson::kArrayType);
 
   for (int i = 0; i < o2::ft0::Ft0FeeConfiguration::NChannels; ++i) {
     timeAligments.PushBack(config->channels.timeAligments[i], allocator);
@@ -64,6 +65,7 @@ void fetchFt0FeeConfig(const std::string ccdbUrl = "http://alice-ccdb.cern.ch",
     rangeCorrectionAdc1.PushBack(config->channels.rangeCorrectionAdc1[i], allocator);
     channelMaskData.PushBack(config->channels.channelMaskData[i], allocator);
     channelMaskTriggers.PushBack(config->channels.channelMaskTriggers[i], allocator);
+    thresholdCalibration.PushBack(config->channels.thresholdCalibration[i], allocator);
   }
 
   channels.AddMember("time_aligments", timeAligments, allocator);
@@ -75,6 +77,7 @@ void fetchFt0FeeConfig(const std::string ccdbUrl = "http://alice-ccdb.cern.ch",
   channels.AddMember("range_correction_adc1", rangeCorrectionAdc1, allocator);
   channels.AddMember("channel_mask_data", channelMaskData, allocator);
   channels.AddMember("channel_mask_triggers", channelMaskTriggers, allocator);
+  channels.AddMember("threshold_calibration", thresholdCalibration, allocator);
   doc.AddMember("channels", channels, allocator);
 
   rapidjson::Value tcm(rapidjson::kObjectType);