lcdd/include/lcdd/detectors

diff -u -r1.2 -r1.3
--- OpticalCalorimeterHitProcessor.hh	22 Aug 2013 22:32:16 -0000	1.2
+++ OpticalCalorimeterHitProcessor.hh	14 Nov 2013 00:46:45 -0000	1.3
@@ -1,27 +1,24 @@

-// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/OpticalCalorimeterHitProcessor.hh,v 1.2 2013/08/22 22:32:16 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/include/lcdd/detectors/OpticalCalorimeterHitProcessor.hh,v 1.3 2013/11/14 00:46:45 jeremy Exp $

 
 #ifndef LCDD_DETECTORS_OPTICALCALORIMETERHITPROCESSOR_HH
 #define LCDD_DETECTORS_OPTICALCALORIMETERHITPROCESSOR_HH 1
 
 // LCDD

-#include "lcdd/detectors/CalorimeterHitProcessor.hh"

+#include "lcdd/detectors/LegacyCalorimeterHitProcessor.hh"

 #include "lcdd/detectors/Cerenkov.hh"
 #include "lcdd/detectors/HitProcessorFactory.hh"
 
 /**
  * @brief HitProcessor to create CalorimeterHit objects in an optical calorimeter.
  */

-class OpticalCalorimeterHitProcessor : public CalorimeterHitProcessor
-{

+class OpticalCalorimeterHitProcessor: public LegacyCalorimeterHitProcessor {

 public:
 
     /**
      * An enum for the two hit collections (cerenkov and edep).
      */

-    enum HCType
-    {
-        eEdep = 0,
-        eCerenkov = 1

+    enum HCType {
+        eEdep = 0, eCerenkov = 1

     };
 
 public:

@@ -59,22 +56,18 @@

 /**
  * The factory for creating new OpticalCalorimeterHitProcessor objects.
  */

-class OpticalCalorimeterHitProcessorFactory : public HitProcessorFactory
-{

+class OpticalCalorimeterHitProcessorFactory: public HitProcessorFactory {

 
 public:
 

-    HitProcessor* createHitProcessor(SensitiveDetector* sd)
-    {

+    HitProcessor* createHitProcessor(SensitiveDetector* sd) {

         return new OpticalCalorimeterHitProcessor(dynamic_cast<CalorimeterSD*>(sd));
     }
 

-    const std::string& handlesType()
-    {

+    const std::string& handlesType() {

         static std::string typeName = "OpticalCalorimeterHitProcessor";
         return typeName;
     }
 };
 

-

 #endif

lcdd/src/lcdd/detectors

diff -u -r1.6 -r1.7
--- OpticalCalorimeterHitProcessor.cc	13 Nov 2013 23:02:56 -0000	1.6
+++ OpticalCalorimeterHitProcessor.cc	14 Nov 2013 00:46:45 -0000	1.7
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/OpticalCalorimeterHitProcessor.cc,v 1.6 2013/11/13 23:02:56 jeremy Exp $

+// $Header: /cvs/lcd/lcdd/src/lcdd/detectors/OpticalCalorimeterHitProcessor.cc,v 1.7 2013/11/14 00:46:45 jeremy Exp $

 
 // LCDD
 #include "lcdd/detectors/OpticalCalorimeterHitProcessor.hh"

@@ -11,7 +11,7 @@

 #include "G4Poisson.hh"
 
 OpticalCalorimeterHitProcessor::OpticalCalorimeterHitProcessor(CalorimeterSD* calorimeter) :

-        CalorimeterHitProcessor(calorimeter), _cerenGenerator(0) {

+        LegacyCalorimeterHitProcessor(calorimeter), _cerenGenerator(0) {

 }
 
 OpticalCalorimeterHitProcessor::~OpticalCalorimeterHitProcessor() {

@@ -45,7 +45,7 @@

     }
 
     if (NCerenPhotons <= 0) {

-        return CalorimeterHitProcessor::processHits(step);

+        return LegacyCalorimeterHitProcessor::processHits(step);

     } else {
         G4ThreeVector myPoint = step->GetPreStepPoint()->GetPosition();
         G4StepPoint* apreStepPoint = step->GetPreStepPoint();