projects/lcdd/branches/v04-01-00-pre/include/lcdd/core

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/core/LCDDProcessor.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/core/LCDDProcessor.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -8,8 +8,8 @@

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

-#include "lcdd/geant4/PhysicsLimitSet.hh"
-#include "lcdd/geant4/LCDDHeaderRecord.hh"

+#include "lcdd/core/PhysicsLimitSet.hh"
+#include "lcdd/core/LCDDHeaderRecord.hh"

 
 // STL
 #include <string>

projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/BasicTrackerHitProcessor.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/BasicTrackerHitProcessor.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -15,7 +15,7 @@

     /**
      * Class constructor.
      */

-    BasicTrackerHitProcessor(TrackerSD* tracker);

+    BasicTrackerHitProcessor();

 
     /**
      * Class destructor.

@@ -37,8 +37,8 @@

 
 public:
 

-    HitProcessor* createHitProcessor(SensitiveDetector* sd) {
-        return new BasicTrackerHitProcessor(dynamic_cast<TrackerSD*>(sd));

+    HitProcessor* createHitProcessor() {
+        return new BasicTrackerHitProcessor();

     }
 
     const std::string& handlesType() {

projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/CalorimeterHitProcessor.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/CalorimeterHitProcessor.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -18,7 +18,8 @@

     /**
      * Class destructor.
      */

-    virtual ~CalorimeterHitProcessor();

+    virtual ~CalorimeterHitProcessor() {
+    }

 
 protected:
 

@@ -26,7 +27,8 @@

      * Class constructor.
      * @param[in] ro The CellReadout used by the processor.
      */

-    CalorimeterHitProcessor(CalorimeterSD* calorimeter);

+    CalorimeterHitProcessor() {
+    }

 
 public:
 

@@ -35,10 +37,14 @@

      * @param[in] step The G4Step object of the energy deposition.
      * @todo This should really be pure virtual, but I can't get it to link correctly.
      */

-    virtual bool processHits(G4Step* step);

+    virtual bool processHits(G4Step* step) = 0;

-protected:
-    CalorimeterSD* _calorimeter;

+    /**
+     * Get the Calorimeter associated with this HitProcessor.
+     */
+    CalorimeterSD* getCalorimeter() {
+        return dynamic_cast<CalorimeterSD*>(getSensitiveDetector());
+    }

 };
 
 #endif

projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/HitProcessor.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/HitProcessor.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -4,8 +4,10 @@

 // Geant4
 #include "G4Step.hh"
 

+class SensitiveDetector;
+

 /**

- * @brief Pure virtual class defining an interface for processing hits from within sensitive detectors.

+ * @brief Virtual class defining an interface for processing hits from within sensitive detectors.

  */
 class HitProcessor {
 

@@ -14,14 +16,17 @@

     /**
      * Class constructor.
      */

-    HitProcessor();

+    HitProcessor()
+        : _detector(NULL) {
+    }

 
 public:
 
     /**
      * Class destructor.
      */

-    virtual ~HitProcessor();

+    virtual ~HitProcessor() {
+    }

 
     /**
      * Process steps to produce hits.

@@ -29,6 +34,26 @@

      * @return True if hits were created or modified; false if not.
      */
     virtual bool processHits(G4Step* step) = 0;

+
+    /**
+     * Get the SensitiveDetector associated with this HitProcessor.
+     * @return The SensitiveDetector of this HitProcessor.
+     */
+    SensitiveDetector* getSensitiveDetector() const {
+        return _detector;
+    }
+
+    /**
+     * Set the SensitiveDetector associated with this HitProcessor.
+     * @param[in] detector The SensitiveDetector of this HitProcessor.
+     */
+    void setSensitiveDetector(SensitiveDetector* detector) {
+        _detector = detector;
+    }
+
+private:
+
+    SensitiveDetector* _detector;

 };
 
 #endif

projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/HitProcessorFactory.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/HitProcessorFactory.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -25,7 +25,7 @@

      * @param[in] sd The SensitiveDetector to which the HitProcessor will be added.
      * @return The specific implementation of HitProcessor produced by this factory.
      */

-    virtual HitProcessor* createHitProcessor(SensitiveDetector* sd) = 0;

+    virtual HitProcessor* createHitProcessor() = 0;

 
     /**
      * Get the type of HitProcessor created by this factory e.g. name of the class.

projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/LegacyCalorimeterHitProcessor.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/LegacyCalorimeterHitProcessor.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -17,7 +17,7 @@

     /**
      * Class constructor.
      */

-    LegacyCalorimeterHitProcessor(CalorimeterSD* calorimeter);

+    LegacyCalorimeterHitProcessor();

 
     /**
      * Class destructor.

@@ -38,8 +38,8 @@

 
 public:
 

-    HitProcessor* createHitProcessor(SensitiveDetector* sd) {
-        return new LegacyCalorimeterHitProcessor(dynamic_cast<CalorimeterSD*>(sd));

+    HitProcessor* createHitProcessor() {
+        return new LegacyCalorimeterHitProcessor();

     }
 
     const std::string& handlesType() {

projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/ScoringTrackerHitProcessor.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/ScoringTrackerHitProcessor.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -16,7 +16,7 @@

      * Class constructor.
      * @param[in] tracker The tracker SD.
      */

-    ScoringTrackerHitProcessor(TrackerSD* tracker);

+    ScoringTrackerHitProcessor();

 
     /**
      * Class destructor.

@@ -41,8 +41,8 @@

 
 public:
 

-    HitProcessor* createHitProcessor(SensitiveDetector* sd) {
-        return new ScoringTrackerHitProcessor(dynamic_cast<TrackerSD*>(sd));

+    HitProcessor* createHitProcessor() {
+        return new ScoringTrackerHitProcessor();

     }
 
     const std::string& handlesType() {

projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/TrackerHitProcessor.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/detectors/TrackerHitProcessor.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -13,12 +13,14 @@

      * Class constructor.
      * @param[in] tracker Pointer to TrackerSD.
      */

-    TrackerHitProcessor(TrackerSD* tracker);

+    TrackerHitProcessor() {
+    }

 
     /**
      * Class destructor.
      */

-    virtual ~TrackerHitProcessor();

+    virtual ~TrackerHitProcessor() {
+    }

 
     /**
      * Process hits to produce steps.

@@ -27,9 +29,12 @@

      */
     virtual bool processHits(G4Step* step) = 0;
 

-protected:
-
-    TrackerSD* _tracker;

+    /**
+     * Get the Calorimeter associated with this HitProcessor.
+     */
+    inline TrackerSD* getTracker() {
+        return dynamic_cast<TrackerSD*>(getSensitiveDetector());
+    }

 };
 
 #endif

projects/lcdd/branches/v04-01-00-pre/include/lcdd/id

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/id/IdManager.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/id/IdManager.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -4,8 +4,8 @@

 // LCDD
 #include "lcdd/id/IdSpec.hh"
 #include "lcdd/id/IdVec.hh"

-#include "lcdd/geant4/PhysVolId.hh"
-#include "lcdd/geant4/PhysVolIdMap.hh"

+#include "lcdd/id/PhysVolId.hh"
+#include "lcdd/id/PhysVolIdMap.hh"

 
 // Geant4
 #include "G4VPhysicalVolume.hh"

projects/lcdd/branches/v04-01-00-pre/include/lcdd/subscribers

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/subscribers/volumeExtendedSubscriber.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/subscribers/volumeExtendedSubscriber.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -12,7 +12,7 @@

 #include "lcdd/core/LCDDProcessor.hh"
 #include "lcdd/id/IdManager.hh"
 #include "lcdd/detectors/SensitiveDetector.hh"

-#include "lcdd/geant4/PhysicsLimitSet.hh"

+#include "lcdd/core/PhysicsLimitSet.hh"

 #include "lcdd/schema/sensitive_detector.hh"
 #include "lcdd/schema/RegionType.hh"
 #include "lcdd/schema/physvolidElem.hh"

projects/lcdd/branches/v04-01-00-pre/include/lcdd/util

--- projects/lcdd/branches/v04-01-00-pre/include/lcdd/util/StoreInspector.hh	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/include/lcdd/util/StoreInspector.hh	2014-08-05 20:27:12 UTC (rev 3226)
@@ -5,8 +5,8 @@

 #include "lcdd/core/LCDDProcessor.hh"
 #include "lcdd/id/IdManager.hh"
 #include "lcdd/detectors/SensitiveDetector.hh"

-#include "lcdd/geant4/PhysicsLimitSet.hh"
-#include "lcdd/geant4/UserRegionInformation.hh"

+#include "lcdd/core/PhysicsLimitSet.hh"
+#include "lcdd/core/UserRegionInformation.hh"

 
 // Geant4
 #include "G4UIcmdWithAString.hh"

projects/lcdd/branches/v04-01-00-pre/src/lcdd/core

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/core/GeometryManager.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/core/GeometryManager.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -1,7 +1,7 @@

 #include "lcdd/core/GeometryManager.hh"
 
 // LCDD

-#include "lcdd/geant4/UserRegionInformation.hh"

+#include "lcdd/core/UserRegionInformation.hh"

 //#include "lcdd/core/G4StoreManager.hh"
 
 // GDML

projects/lcdd/branches/v04-01-00-pre/src/lcdd/core

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/core/LCDDLibLoad.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/core/LCDDLibLoad.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -33,7 +33,6 @@

     LOAD_COMPONENT (grid_xyzProcess);
     LOAD_COMPONENT (projective_cylinderProcess);
     LOAD_COMPONENT (projective_zplaneProcess);

-    LOAD_COMPONENT (nonprojective_cylinderProcess);

     LOAD_COMPONENT (global_grid_xyProcess);
     LOAD_COMPONENT (cell_readout_2dProcess);
 

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/BasicTrackerHitProcessor.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/BasicTrackerHitProcessor.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -2,21 +2,23 @@

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

-#include "lcdd/geant4/VUserTrackInformation.hh"

+#include "lcdd/core/VUserTrackInformation.hh"

 
 // Geant4
 #include "G4Geantino.hh"
 #include "G4ChargedGeantino.hh"
 #include "globals.hh"
 

-BasicTrackerHitProcessor::BasicTrackerHitProcessor(TrackerSD* tracker) :
-        TrackerHitProcessor(tracker) {

+BasicTrackerHitProcessor::BasicTrackerHitProcessor() {

 }
 
 BasicTrackerHitProcessor::~BasicTrackerHitProcessor() {
 }
 
 bool BasicTrackerHitProcessor::processHits(G4Step* step) {

+
+    TrackerSD* tracker = getTracker();
+

     // Get the total energy deposition.
     G4double edep = step->GetTotalEnergyDeposit();
 

@@ -28,7 +30,7 @@

     }
 
     // Check edep < cut and not Geantino.

-    if (edep <= _tracker->getEnergyCut() && isGeantino == false) {

+    if (edep <= tracker->getEnergyCut() && isGeantino == false) {

         return false;
     }
 

@@ -76,7 +78,7 @@

     TrackerHit* hit = new TrackerHit();
 
     // Create the hit's identifier.

-    Id64bit id64 = _tracker->makeIdentifier(step);

+    Id64bit id64 = tracker->makeIdentifier(step);

 
     // Set the hit information from above.
     hit->setTrackID(trackID);

@@ -88,7 +90,7 @@

     hit->setLength(length);
 
     // Add the hit to the TrackerSD.

-    _tracker->addHit(hit);

+    tracker->addHit(hit);

 
     // Get the TrackInformation and flag track as having a tracker hit.
     VUserTrackInformation* trackInformation = dynamic_cast<VUserTrackInformation*>(step->GetTrack()->GetUserInformation());

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/CalorimeterHitProcessor.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/CalorimeterHitProcessor.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -1,15 +0,0 @@

-#include "lcdd/detectors/CalorimeterHitProcessor.hh"
-
-// LCDD
-#include "lcdd/detectors/CalorimeterSD.hh"
-
-CalorimeterHitProcessor::CalorimeterHitProcessor(CalorimeterSD* calorimeter) :
-        _calorimeter(calorimeter) {
-}
-
-CalorimeterHitProcessor::~CalorimeterHitProcessor() {
-}
-
-bool CalorimeterHitProcessor::processHits(G4Step* step) {
-    return false;
-}

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/HitProcessor.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/HitProcessor.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -1,7 +0,0 @@

-#include "lcdd/detectors/HitProcessor.hh"
-
-HitProcessor::HitProcessor() {
-}
-
-HitProcessor::~HitProcessor() {
-}

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/LegacyCalorimeterHitProcessor.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/LegacyCalorimeterHitProcessor.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -8,8 +8,7 @@

 #include "G4Geantino.hh"
 #include "G4ChargedGeantino.hh"
 

-LegacyCalorimeterHitProcessor::LegacyCalorimeterHitProcessor(CalorimeterSD* calorimeter) :
-        CalorimeterHitProcessor(calorimeter) {

+LegacyCalorimeterHitProcessor::LegacyCalorimeterHitProcessor() {

 }
 
 LegacyCalorimeterHitProcessor::~LegacyCalorimeterHitProcessor() {

@@ -17,6 +16,8 @@

 
 bool LegacyCalorimeterHitProcessor::processHits(G4Step* step) {
 

+    CalorimeterSD* calorimeter = getCalorimeter();
+

     // Get the energy deposition.
     G4double edep = step->GetTotalEnergyDeposit();
 

@@ -28,12 +29,12 @@

     }
 
     // Cut on energy deposition <= cut but allow Geantinos.

-    if (edep <= _calorimeter->getEnergyCut() && isGeantino == false) {

+    if (edep <= calorimeter->getEnergyCut() && isGeantino == false) {

         return false;
     }
 
     // Get the Segmentation from the CalorimeterSD.

-    Segmentation* segmentation = _calorimeter->getSegmentation();

+    Segmentation* segmentation = calorimeter->getSegmentation();

 
     // Get the global cell position from the Segmentation.
     G4ThreeVector globalCellPosition = segmentation->getGlobalHitPosition(step);

@@ -43,10 +44,10 @@

     segmentation->setBins(step);
 
     // Create a 64-bit ID from the step information.

-    Id64bit id = _calorimeter->makeIdentifier(step);

+    Id64bit id = calorimeter->makeIdentifier(step);

 
     // Check for an existing hit with this identifier.

-    CalorimeterHit* hit = _calorimeter->findHit(id);

+    CalorimeterHit* hit = calorimeter->findHit(id);

 
     // Was there a hit found with this identifier?
     if (hit == NULL) {

@@ -55,7 +56,7 @@

         hit = new CalorimeterHit(id, edep, globalCellPosition);
 
         // Add the new hit to the calorimeter.

-        _calorimeter->addHit(hit);

+        calorimeter->addHit(hit);

 
     } else {
 

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/ScoringTrackerHitProcessor.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/ScoringTrackerHitProcessor.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -3,8 +3,8 @@

 // Geant4
 #include "G4ThreeVector.hh"
 

-ScoringTrackerHitProcessor::ScoringTrackerHitProcessor(TrackerSD* tracker) :
-        TrackerHitProcessor(tracker), _currentTrackId(-1) {

+ScoringTrackerHitProcessor::ScoringTrackerHitProcessor() :
+    _currentTrackId(-1) {

 }
 
 ScoringTrackerHitProcessor::~ScoringTrackerHitProcessor() {

@@ -42,7 +42,7 @@

         TrackerHit* newHit = new TrackerHit();
 
         // create id vector

-        Id64bit id64 = _tracker->makeIdentifier(step);

+        Id64bit id64 = getTracker()->makeIdentifier(step);

 
         // Get the start position from the pre-step point.
         G4ThreeVector startPosition = step->GetPreStepPoint()->GetPosition();

@@ -63,7 +63,7 @@

         newHit->setLength(length);
 
         // Add hit to SD.

-        _tracker->addHit(newHit, false);

+        getTracker()->addHit(newHit, false);

     }
     return true;
 }

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetector.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetector.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -251,6 +251,7 @@

 }
 
 void SensitiveDetector::addHitProcessor(HitProcessor* processor) {

+    processor->setSensitiveDetector(this);

     _hitProcessors.push_back(processor);
 }
 

@@ -260,6 +261,7 @@

 
 void SensitiveDetector::addHitProcessors(std::vector<HitProcessor*> processors) {
     for (HitProcessors::iterator it = processors.begin(); it != processors.end(); it++) {

+        (*it)->setSensitiveDetector(this);

         _hitProcessors.push_back(*it);
     }
 }

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetectorFactory.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/SensitiveDetectorFactory.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -112,7 +112,7 @@

                 std::cerr << "HitProcessorFactory was not found for type: " << type << std::endl;
                 G4Exception("", "", FatalException, "HitProcessor not found");
             }

-            HitProcessor* processor = hitProcessorFactory->createHitProcessor(sensitiveDetector);

+            HitProcessor* processor = hitProcessorFactory->createHitProcessor();

 
             //std::cout << "create hits processor: " << type << std::endl;
 

@@ -129,11 +129,11 @@

             if (sensitiveDetectorTypeName == "tracker") {
                 // Add the default TrackerHitProcessor.
                 sensitiveDetector->addHitProcessor(

-                        HitProcessorManager::instance()->getFactory("BasicTrackerHitProcessor")->createHitProcessor(sensitiveDetector));

+                        HitProcessorManager::instance()->getFactory("BasicTrackerHitProcessor")->createHitProcessor());

             } else if (sensitiveDetectorTypeName == "calorimeter") {
                 // Add the default CalorimeterHitProcessor.
                 sensitiveDetector->addHitProcessor(

-                        HitProcessorManager::instance()->getFactory("LegacyCalorimeterHitProcessor")->createHitProcessor(sensitiveDetector));

+                        HitProcessorManager::instance()->getFactory("LegacyCalorimeterHitProcessor")->createHitProcessor());

             }
         }
 

projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/TrackerHitProcessor.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/detectors/TrackerHitProcessor.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -1,8 +0,0 @@

-#include "lcdd/detectors/TrackerHitProcessor.hh"
-
-TrackerHitProcessor::TrackerHitProcessor(TrackerSD* tracker) :
-        _tracker(tracker) {
-}
-
-TrackerHitProcessor::~TrackerHitProcessor() {
-}

projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers/headerSubscriber.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers/headerSubscriber.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -5,7 +5,7 @@

 
 // LCDD
 #include "lcdd/core/LCDDProcessor.hh"

-#include "lcdd/geant4/LCDDHeaderRecord.hh"

+#include "lcdd/core/LCDDHeaderRecord.hh"

 #include "lcdd/schema/header.hh"
 #include "lcdd/schema/detector.hh"
 #include "lcdd/schema/generator.hh"

projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers/limitsetSubscriber.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers/limitsetSubscriber.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -7,7 +7,7 @@

 #include "lcdd/schema/limit.hh"
 #include "lcdd/schema/limitset.hh"
 #include "lcdd/core/LCDDProcessor.hh"

-#include "lcdd/geant4/PhysicsLimitSet.hh"

+#include "lcdd/core/PhysicsLimitSet.hh"

 #include "lcdd/util/StringUtil.hh"
 
 // STL

projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers

--- projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers/regionSubscriber.cc	2014-08-05 20:14:44 UTC (rev 3225)
+++ projects/lcdd/branches/v04-01-00-pre/src/lcdd/subscribers/regionSubscriber.cc	2014-08-05 20:27:12 UTC (rev 3226)
@@ -6,7 +6,7 @@

 // LCDD
 #include "lcdd/schema/region.hh"
 #include "lcdd/core/LCDDProcessor.hh"

-#include "lcdd/geant4/UserRegionInformation.hh"

+#include "lcdd/core/UserRegionInformation.hh"

 #include "lcdd/schema/LimitSetType.hh"
 #include "lcdd/util/StringUtil.hh"