fix issue in chip configuration (complex types cannot be used in configurables) + fix dictionary creation

Author: maciacco

Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/IOTOFBaseParam.h

@@ -15,6 +15,7 @@
 #include "CommonUtils/ConfigurableParam.h"
 #include "CommonUtils/ConfigurableParamHelper.h"
 
+
 namespace o2
 {
 namespace iotof
@@ -38,6 +39,39 @@ struct ChipSpecifics {
   float SensorSizeRows() const { return ActiveMatrixSizeRows() + PassiveEdgeTop + PassiveEdgeReadOut; }
 };
 
+struct ITOFChipSpecifics : ChipSpecifics {
+  ITOFChipSpecifics()
+  {
+    NCols = 258;
+    NRows = 271;
+    PitchCol = 250.00e-4;
+    PitchRow = 100.00e-4;
+    SensorLayerThicknessEff = 50.e-4;
+    SensorLayerThickness = 50.e-4;
+  }
+};
+
+struct OTOFChipSpecifics : ChipSpecifics {
+  OTOFChipSpecifics()
+  {
+    NCols = 251;
+    NRows = 487;
+    PitchCol = 250.00e-4;
+    PitchRow = 100.00e-4;
+    PassiveEdgeSide = 106.48e-4;
+    SensorLayerThicknessEff = 50.e-4;
+    SensorLayerThickness = 50.e-4;
+  }
+};
+
+struct ITOFChipSpecificParam : public o2::conf::ConfigurableParamPromoter<ITOFChipSpecificParam, ITOFChipSpecifics> {
+  O2ParamDef(ITOFChipSpecificParam, "ITOFChipSpecific");
+};
+
+struct OTOFChipSpecificParam : public o2::conf::ConfigurableParamPromoter<OTOFChipSpecificParam, OTOFChipSpecifics> {
+  O2ParamDef(OTOFChipSpecificParam, "OTOFChipSpecific");
+};
+
 struct IOTOFBaseParam : public o2::conf::ConfigurableParamHelper<IOTOFBaseParam> {
   bool enableInnerTOF = true;       // Enable Inner TOF layer
   bool enableOuterTOF = true;       // Enable Outer TOF layer
@@ -49,9 +83,6 @@ struct IOTOFBaseParam : public o2::conf::ConfigurableParamHelper<IOTOFBaseParam>
   float x2x0 = 0.02f;               // thickness expressed in radiation length, for all layers for the moment
   float sensorThickness = 0.0050f;  // thickness of the sensor in cm, for all layers for the moment, the default is set to 50 microns
 
-  ChipSpecifics iTofChipSpecifics{258, 271, 250.00e-4, 100.00e-4, 0.00f, 0.00e-4, 0.00e-4, 50.e-4, 50.e-4};
-  ChipSpecifics oTofChipSpecifics{251, 487, 250.00e-4, 100.00e-4, 0.00f, 0.00e-4, 106.48e-4, 50.e-4, 50.e-4};
-
   O2ParamDef(IOTOFBaseParam, "IOTOFBase");
 };
 

Detectors/Upgrades/ALICE3/IOTOF/base/src/IOTOFBaseParam.cxx

@@ -11,4 +11,6 @@
 
 #include "IOTOFBase/IOTOFBaseParam.h"
 
-O2ParamImpl(o2::iotof::IOTOFBaseParam);
+O2ParamImpl(o2::iotof::IOTOFBaseParam);
+O2ParamImpl(o2::iotof::ITOFChipSpecificParam);
+O2ParamImpl(o2::iotof::OTOFChipSpecificParam);

Detectors/Upgrades/ALICE3/IOTOF/simulation/src/IOTOFSimulationLinkDef.h

@@ -22,4 +22,15 @@
 #pragma link C++ class o2::iotof::Detector + ;
 #pragma link C++ class o2::base::DetImpl < o2::iotof::Detector> + ;
 
+#pragma link C++ class o2::iotof::DPLDigitizerParam < o2::detectors::DetID::TF3 > + ;
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::iotof::DPLDigitizerParam < o2::detectors::DetID::TF3>> + ;
+
+#pragma link C++ class o2::iotof::ChipSpecifics + ;
+#pragma link C++ class o2::iotof::ITOFChipSpecifics + ;
+#pragma link C++ class o2::iotof::OTOFChipSpecifics + ;
+#pragma link C++ class o2::iotof::ITOFChipSpecificParam + ;
+#pragma link C++ class o2::conf::ConfigurableParamPromoter < o2::iotof::ITOFChipSpecificParam , o2::iotof::ITOFChipSpecifics > + ;
+#pragma link C++ class o2::iotof::OTOFChipSpecificParam + ;
+#pragma link C++ class o2::conf::ConfigurableParamPromoter < o2::iotof::OTOFChipSpecificParam , o2::iotof::OTOFChipSpecifics > + ;
+
 #endif

Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Segmentation.cxx

@@ -37,9 +37,10 @@ Segmentation::Segmentation()
   if (sInstance) {
     printf("Invalid use of public constructor: o2::iotof::Segmentation instance exists\n");
   } else {
-    auto& iotofPars = IOTOFBaseParam::Instance();
-    const ChipSpecifics& mITofChipPars = iotofPars.iTofChipSpecifics;
-    const ChipSpecifics& mOTofChipPars = iotofPars.oTofChipSpecifics;
+    auto& itofPars = ITOFChipSpecificParam::Instance();
+    auto& otofPars = OTOFChipSpecificParam::Instance();
+    const ChipSpecifics mITofChipPars(itofPars.NCols, itofPars.NRows, itofPars.PitchCol, itofPars.PitchRow, itofPars.PassiveEdgeReadOut, itofPars.PassiveEdgeTop, itofPars.PassiveEdgeSide, itofPars.SensorLayerThicknessEff, itofPars.SensorLayerThickness);
+    const ChipSpecifics mOTofChipPars(otofPars.NCols, otofPars.NRows, otofPars.PitchCol, otofPars.PitchRow, otofPars.PassiveEdgeReadOut, otofPars.PassiveEdgeTop, otofPars.PassiveEdgeSide, otofPars.SensorLayerThicknessEff, otofPars.SensorLayerThickness);
 
     configChip(mITofChipPars, 0 /* subDetectorID for iTOF */);
     configChip(mOTofChipPars, 1 /* subDetectorID for oTOF */);