Remove getDet in CaloFuture2DView

Remove the usage of getDet in CaloFuture2Dview by getting DeCalorimeter object from the users, which now explicit have it as input. Clean-up of methods not used anywhere.

This class needs to be completely changed to comply with the new thread-safe histograms in a future MR so no full modernisation is intended here. FYI @sponce

Addresses Rec#350 (closed) , also related to Rec#330 (closed)

Needs Rec!3089 (merged)

CaloFuture/CaloFutureUtils/include/CaloFutureUtils/CaloFuture2Dview.h

@@ -46,61 +46,38 @@ public:
   void bookCaloFuture2D( const HistoID& unit, const std::string title, std::string name, int area = -1 ) const;
   void bookCaloFuture2D( const HistoID& unit, const std::string title, LHCb::Detector::Calo::CellCode::Index calo,
                          int area = -1 ) const;
-  void fillCaloFuture2D( const HistoID& unit, LHCb::MCCaloHit mchit, const std::string title = "" ) const;
-  void fillCaloFuture2D( const HistoID& unit, LHCb::MCCaloDigit mcdigit, const std::string title = "" ) const;
-  void fillCaloFuture2D( const HistoID& unit, LHCb::CaloDigit digit, const std::string title = "" ) const;
-  void fillCaloFuture2D( const HistoID& unit, LHCb::CaloAdc adc, const std::string title = "" ) const;
-  void fillCaloFuture2D( const HistoID& unit, LHCb::CaloCluster cluster, const std::string title = "" ) const;
   void fillCaloFuture2D( const HistoID& unit, const LHCb::Detector::Calo::CellID& id, double value,
-                         const std::string title = "" ) const;
-  void fillCaloFuturePin2D( const HistoID& unit, const LHCb::Detector::Calo::CellID& id, double value,
-                            const std::string title = "" ) const;
+                         const DeCalorimeter& calo, const std::string title = "" ) const;
 
-  void reset( const HistoID& unit, std::string title = "" ) const;
-  void resetTitle( const HistoID& unit, std::string title ) const;
-
-  void          setThreshold( double threshold ) { m_threshold = threshold; };
-  void          setPinView( bool pin ) { m_pin = pin; };
-  void          setActualSize( bool dim ) { m_dim = dim; };
-  void          setL0ClusterView( bool l0 ) const { m_l0 = l0; };
-  void          setOffset( double offset ) { m_offset = offset; };
-  void          setFlux( bool flux ) { m_flux = flux; }
-  void          setEnergyWeighted( bool energyWeighted ) { m_energyWeighted = energyWeighted; }
-  void          setGeometricalView( bool geo ) { m_geo = geo; }
-  void          setOneDimension( bool dim ) { m_1d = dim; }
-  void          setSplit( bool split ) { m_split = split; }
   bool          split() const { return m_split; }
   const HistoID getUnit( const HistoID& unit, int calo, int area ) const;
 
   // Container of the subdetector info
   struct CaloFutureParams {
-    DeCalorimeter*                            calo;
     int                                       nChan;
     int                                       centre;
     int                                       reg;
     int                                       fCard;
     int                                       lCard;
     std::vector<LHCb::Detector::Calo::CellID> refCell;
-    // these are calculated (cached) after init
-    std::vector<double> xsize;
-    std::vector<double> ysize;
+    std::vector<float>                        cellSizes;
   };
 
 protected:
-  mutable bool m_l0; // due to some fillCaloFuture2D method enforcing m_l0=true
-  bool         m_dim;
-  bool         m_pin;
-  bool         m_energyWeighted;
-  bool         m_flux;
-  bool         m_geo;
-  bool         m_split;
-  bool         m_1d;
-  bool         m_profile;
-  int          m_bin1d;
-  double       m_threshold;
-  double       m_offset;
-  std::string  m_lab;
-  std::string  m_prof;
+  Gaudi::Property<bool>  m_1d{this, "OneDimension", false}; // 1D histo (value versus CaloCellID) default is 2D view
+  Gaudi::Property<bool>  m_profile{this, "Profile", false}; // 1D histo profile type ?
+  Gaudi::Property<int>   m_bin1d{this, "Bin1D", 16384};     // 1D histo binning (default : full 14 bits dynamics)
+  Gaudi::Property<bool>  m_geo{this, "GeometricalView",
+                              true}; // 2D :  true : geometrical (x,y) | false : readout (FEB,channel)
+  Gaudi::Property<float> m_threshold{this, "Threshold", -256.}; // threshold on the input value (bin weight)
+  Gaudi::Property<float> m_offset{this, "Offset", 0.0};         // bin weight =  (value + offset)
+  Gaudi::Property<bool>  m_dim{this, "ActualSize", true};    // true: (x,y) | false : (col,row) (geometrical view only)
+  Gaudi::Property<bool>  m_l0{this, "L0ClusterView", false}; // bin weight on 2x2 cluster (geometrical view only)
+  Gaudi::Property<bool>  m_energyWeighted{this, "EnergyWeighted", true}; // true : bin weight = energy | false :  1
+  Gaudi::Property<bool>  m_flux{this, "Flux", false}; // bin weight is normalized to the cell area (for both views)
+  Gaudi::Property<bool>  m_split{this, "SplitAreas", false}; // produce one view per area (for geometrical view only)
+  Gaudi::Property<std::string> m_lab{this, "xLabelOptions", "v"}; // Crate-FEB text label on Xaxis (readout view only)
+  Gaudi::Property<std::string> m_prof{this, "ProfileError", ""};
 
 private:
   std::string getTitle( std::string title, int calo, int area ) const;