dd4hep Update of CaloGeometry

Dumpers/BinaryDumpers/options/allen.py

@@ -13,7 +13,8 @@ from PyConf.application import (
     ApplicationOptions)
 from PyConf.Algorithms import (
     AllenTESProducer,
-    DumpBeamline
+    DumpBeamline,
+    DumpCaloGeometry
 )
 from threading import Thread
 from time import sleep
@@ -194,7 +195,7 @@ config.add(
             'SIMCOND': options.conddb_tag,
         }))
 
-converters = [DumpBeamline()]
+converters = [DumpBeamline(),DumpCaloGeometry()]
 producers = []
 for converter in converters:
     converter_id = converter.type.getDefaultProperties()['ID']

Dumpers/BinaryDumpers/src/DumpCaloGeometry.cpp

@@ -19,21 +19,91 @@
 #include "DumpCaloGeometry.h"
 #include <Dumpers/Utils.h>
 
+
+
+#include <DetDesc/Condition.h>
+#include <DetDesc/ConditionAccessorHolder.h>
+#include <GaudiAlg/Transformer.h>
+
+#include <Dumpers/Identifiers.h>
+
+// namespace {
+//   const std::map<std::string, std::string> ids = {{"EcalDet", Allen::NonEventData::ECalGeometry::id},
+//                                                   {"HcalDet", Allen::NonEventData::HCalGeometry::id}};
+//   using namespace std::string_literals;
+//   constexpr unsigned max_neighbors = 9;
+// }
+
+// Applies only to E Calorimeter
+
+
+// namespace {
+//inline const std::string EcalCond = "/dd/Structure/LHCb/DownstreamRegion/Ecal";
+
+//   struct ECal_t {
+    
+//     // Add some variables for ECal
+
+//     ECal_t( Condition const& c )
+    
+//     //Put the correct parameters For E Calorimeter (if needed)
+//         // : X{( c.param<double>( "ResolPosRC" ) + c.param<double>( "ResolPosLA" ) ) / 2}
+//         // , Y{c.param<double>( "ResolPosY" )} {}
+//   };
+// }
+
+/** @class DumpCaloGeometry
+ *  Dump Calo Geometry.
+ *
+ *  @author Nabil Garroum
+ *  @date   2022-02-14
+ */
+class DumpCaloGeometry final
+  : public Gaudi::Functional::MultiTransformer<std::tuple<std::vector<char>, std::string>(
+                                                const DeCalorimeter&),
+                                            LHCb::DetDesc::usesConditions<DeCalorimeter>> {
+public:
+
+  DumpCaloGeometry( const std::string& name, ISvcLocator* svcLoc );
+
+  std::tuple<std::vector<char>, std::string> operator()( const DeCalorimeter& DeCalorimeter ) const override;
+
+  Gaudi::Property<std::string> m_id{this, "ID", Allen::NonEventData::ECal::id}; // Correct ECal for Ecalorimeter for Allen Namespace
+};
+
+
+
 DECLARE_COMPONENT(DumpCaloGeometry)
 
-namespace {
-  const std::map<std::string, std::string> ids = {{"EcalDet", Allen::NonEventData::ECalGeometry::id},
-                                                  {"HcalDet", Allen::NonEventData::HCalGeometry::id}};
-  using namespace std::string_literals;
-  constexpr unsigned max_neighbors = 9;
-} // namespace
 
-DumpUtils::Dumps DumpCaloGeometry::dumpGeometry() const
+
+
+
+// Add the multitransformer call , which keyvalues for E calorimeter ?/ keep the same keyvalues ?
+
+DumpCaloGeometry::DumpCaloGeometry( const std::string& name, ISvcLocator* svcLoc )
+    : MultiTransformer( name, svcLoc,
+                   {KeyValue{"ECalLocation", DeCalorimeterLocation::Ecal}},
+                   {KeyValue{"Converted", "Allen/NonEventData/ECal"},
+                    KeyValue{"OutputID", "Allen/NonEventData/ECalID"}}) {}
+
+
+
+// Add the operator() call
+
+std::tuple<std::vector<char>, std::string> DumpCaloGeometry::operator()( const DeCalorimeter& DeCalorimeter ) const 
 {
 
-  // Detector and mat geometry
-  const DeCalorimeter& det = detector();
+   
+
+
+
+
+
 
+
+  // Detector and mat geometry
+  
   // SourceID to feCards: tell1ToCards for 0 - det.nTell1s   Returns tell1Param which has .feCards int vector.
   // Bank header code to card using cardCode() function which operates on CardParam which has card code and channels.
   // check codes in Python; check feCards to code if this is standard somehow.
@@ -189,10 +259,15 @@ DumpUtils::Dumps DumpCaloGeometry::dumpGeometry() const
     throw GaudiException {"Cannot find "s + det.caloName(), name(), StatusCode::FAILURE};
   }
 
-  if (det.caloName()[0] == 'E') {
-    return {{std::tuple {output.buffer(), "ecal_geometry", id->second}}};
-  }
-  else {
-    return {{std::tuple {output.buffer(), "hcal_geometry", id->second}}};
-  }
+  // if (det.caloName()[0] == 'E') {
+  //   return {{std::tuple {output.buffer(), "ecal_geometry", id->second}}};
+  // }
+  // else {
+  //   return {{std::tuple {output.buffer(), "hcal_geometry", id->second}}};
+
+  //return {{std::tuple {output.buffer(), m_id}}};
+
+  return std::tuple {output.buffer(), m_id};
+
+  
 }