Format dev

include/Hcal/Event/HcalHit.h

@@ -20,7 +20,7 @@ namespace ldmx {
  * from the HCAL, providing particular information for the HCAL,
  * above and beyond what is available in the CalorimeterHit.
  */
-class HcalHit : public CalorimeterHit {
+class HcalHit : public ldmx::CalorimeterHit {
  public:
   /**
    * Class constructor.
@@ -84,7 +84,6 @@ class HcalHit : public CalorimeterHit {
    */
   ClassDef(HcalHit, 2);
 };
-
 }  // namespace ldmx
 
 #endif /* HCAL_EVENT_HCALHIT_H_ */

include/Hcal/Event/HcalVetoResult.h

@@ -38,7 +38,7 @@ class HcalVetoResult {
   bool passesVeto() const { return passesVeto_; };
 
   /** @return The maximum PE HcalHit. */
-  inline HcalHit getMaxPEHit() const { return maxPEHit_; }
+  inline ldmx::HcalHit getMaxPEHit() const { return maxPEHit_; }
 
   /**
    * Sets whether the Hcal veto was passed or not.
@@ -54,11 +54,13 @@ class HcalVetoResult {
    *
    * @param maxPEHit The maximum PE HcalHit
    */
-  inline void setMaxPEHit(const HcalHit maxPEHit) { maxPEHit_ = maxPEHit; }
+  inline void setMaxPEHit(const ldmx::HcalHit maxPEHit) {
+    maxPEHit_ = maxPEHit;
+  }
 
  private:
   /** Reference to max PE hit. */
-  HcalHit maxPEHit_;
+  ldmx::HcalHit maxPEHit_;
 
   /** Flag indicating whether the event passes the Hcal veto. */
   bool passesVeto_{false};

include/Hcal/HcalDigiProducer.h

@@ -19,15 +19,15 @@
 #include "Framework/EventProcessor.h"
 #include "Tools/NoiseGenerator.h"
 
-namespace ldmx {
+namespace hcal {
 
 /**
  * @class HcalDigiProducer
  * @brief Performs digitization of simulated HCal data
  */
-class HcalDigiProducer : public Producer {
+class HcalDigiProducer : public framework::Producer {
  public:
-  HcalDigiProducer(const std::string& name, Process& process);
+  HcalDigiProducer(const std::string& name, framework::Process& process);
 
   virtual ~HcalDigiProducer() { ; }
 
@@ -36,19 +36,19 @@ class HcalDigiProducer : public Producer {
    *
    * @param parameters Set of parameters used to configure this processor.
    */
-  void configure(Parameters& parameters) final override;
+  void configure(framework::config::Parameters& parameters) final override;
 
-  virtual void produce(Event& event);
+  virtual void produce(framework::Event& event);
 
-  HcalID generateRandomID(HcalID::HcalSection sec);
-  void constructNoiseHit(std::vector<HcalHit>&, HcalID::HcalSection, double,
-                         double, const std::map<unsigned int, float>&,
+  ldmx::HcalID generateRandomID(ldmx::HcalID::HcalSection sec);
+  void constructNoiseHit(std::vector<ldmx::HcalHit>&, ldmx::HcalID::HcalSection,
+                         double, double, const std::map<unsigned int, float>&,
                          std::unordered_set<unsigned int>&);
 
  private:
   bool verbose_{false};
   std::unique_ptr<TRandom3> random_{nullptr};
-  std::unique_ptr<NoiseGenerator> noiseGenerator_{nullptr};
+  std::unique_ptr<ldmx::NoiseGenerator> noiseGenerator_{nullptr};
 
   double meanNoise_{0};
   int nProcessed_{0};
@@ -67,6 +67,6 @@ class HcalDigiProducer : public Producer {
   int SUPER_STRIP_SIZE_{1};
 };
 
-}  // namespace ldmx
+}  // namespace hcal
 
 #endif

include/Hcal/HcalVetoProcessor.h

@@ -20,12 +20,12 @@
 #include "Framework/Configure/Parameters.h"
 #include "Framework/EventProcessor.h"
 
-namespace ldmx {
+namespace hcal {
 
-class HcalVetoProcessor : public Producer {
+class HcalVetoProcessor : public framework::Producer {
  public:
   /** Constructor */
-  HcalVetoProcessor(const std::string &name, Process &process);
+  HcalVetoProcessor(const std::string &name, framework::Process &process);
 
   /** Destructor */
   ~HcalVetoProcessor();
@@ -35,15 +35,15 @@ class HcalVetoProcessor : public Producer {
    *
    * @param parameters Set of parameters used to configure this processor.
    */
-  void configure(Parameters &parameters) final override;
+  void configure(framework::config::Parameters &parameters) final override;
 
   /**
    * Run the processor and create a collection of results which
    * indicate if the event passes/fails the Hcal veto.
    *
    * @param event The event to process.
    */
-  void produce(Event &event);
+  void produce(framework::Event &event);
 
  private:
   /** Total PE threshold. */
@@ -59,6 +59,6 @@ class HcalVetoProcessor : public Producer {
   float minPE_{1};
 
 };  // HcalVetoProcessor
-}  // namespace ldmx
+}  // namespace hcal
 
 #endif  // HCAL_HCALVETOPROCESSOR_H_

python/hcal.py

@@ -14,7 +14,7 @@ class HcalDigiProducer(ldmxcfg.Producer) :
     """
 
     def __init__(self,name = 'hcalDigis') :
-        super().__init__(name,'ldmx::HcalDigiProducer','Hcal')
+        super().__init__(name,'hcal::HcalDigiProducer','Hcal')
 
         self.meanNoise = 0.02
         self.readoutThreshold= 1
@@ -43,7 +43,7 @@ class HcalVetoProcessor(ldmxcfg.Producer) :
     """
 
     def __init__(self,name = 'hcalVeto') :
-        super().__init__(name,'ldmx::HcalVetoProcessor','Hcal')
+        super().__init__(name,'hcal::HcalVetoProcessor','Hcal')
 
         self.pe_threshold = 5.0
         self.max_time = 50.0

src/Hcal/Event/HcalHit.cxx

@@ -7,7 +7,7 @@ ClassImp(ldmx::HcalHit)
 
     namespace ldmx {
   void HcalHit::Clear() {
-    CalorimeterHit::Clear();
+    ldmx::CalorimeterHit::Clear();
     pe_ = 0;
     minpe_ = -99;
   }
@@ -19,4 +19,4 @@ ClassImp(ldmx::HcalHit)
               << "ns, amplitude: " << getAmplitude() << ", pe: " << getPE()
               << "}" << std::endl;
   }
-}
+}  // namespace ldmx

src/Hcal/Event/HcalVetoResult.cxx

@@ -1,10 +1,3 @@
-/**
- * @file HcalVetoResult.h
- * @brief Class used to encapsulate the results obtained from
- *        HcalVetoProcessor.
- * @author Omar Moreno, SLAC National Accelerator Laboratory
- */
-
 #include "Hcal/Event/HcalVetoResult.h"
 
 //----------------//
@@ -31,4 +24,4 @@ ClassImp(ldmx::HcalVetoResult)
               << " Passes veto: " << passesVeto_ << std::endl;
     maxPEHit_.Print();
   }
-}
+}  // namespace ldmx