Import Geant4 10.5.1 source tree

source/digits_hits/detector/include/G4SDManager.hh

@@ -37,6 +37,9 @@ class G4VSensitiveDetector;
 class G4HCofThisEvent;
 class G4SDmessenger;
 
+#include "G4VSDFilter.hh"
+#include <vector>
+
 // class description:
 //
 //  This is a singleton class which manages the sensitive detectors.
@@ -104,6 +107,12 @@ private:
     G4SDManager( const G4SDManager& );
     G4SDManager& operator=(const G4SDManager&);
 
+public:
+    void RegisterSDFilter(G4VSDFilter* filter);
+    void DeRegisterSDFilter(G4VSDFilter* filter);
+private:
+    void DestroyFilters();
+    std::vector<G4VSDFilter*> FilterList;
 };
 
 

source/digits_hits/detector/include/G4SDStructure.hh

@@ -49,7 +49,7 @@ class G4SDStructure
       G4SDStructure(G4String aPath);
       ~G4SDStructure();
 
-      G4int operator==(const G4SDStructure &right) const;
+      G4bool operator==(const G4SDStructure &right) const;
 
       void AddNewDetector(G4VSensitiveDetector*aSD, G4String treeStructure);
       void Activate(G4String aName, G4bool sensitiveFlag);

source/digits_hits/detector/include/G4SensitiveVolumeList.hh

@@ -67,8 +67,8 @@ class G4SensitiveVolumeList
 );
 
     //Equality Operations
-      G4int operator==(const G4SensitiveVolumeList &right) const;
-      G4int operator!=(const G4SensitiveVolumeList &right) const;
+      G4bool operator==(const G4SensitiveVolumeList &right) const;
+      G4bool operator!=(const G4SensitiveVolumeList &right) const;
 
 
     //Other Operations

source/digits_hits/detector/include/G4VReadOutGeometry.hh

@@ -46,8 +46,8 @@ class G4VReadOutGeometry
       G4VReadOutGeometry(G4String);
       virtual ~G4VReadOutGeometry();
 
-      G4int operator==(const G4VReadOutGeometry &right) const;
-      G4int operator!=(const G4VReadOutGeometry &right) const;
+      G4bool operator==(const G4VReadOutGeometry &right) const;
+      G4bool operator!=(const G4VReadOutGeometry &right) const;
 
       // buildROGeomety must be invoked to Build (ie Build() method)
       // the ROGeometry. It sets up in addition the needed

source/digits_hits/detector/include/G4VSDFilter.hh

@@ -35,7 +35,7 @@ class G4Step;
 // class description:
 //
 //  This is the abstract base class of a filter to be associated with a
-// sensitive detector. 
+// sensitive detector or a primitive scorer. 
 
 class G4VSDFilter 
 {

source/digits_hits/detector/include/G4VSensitiveDetector.hh

@@ -61,8 +61,8 @@ class G4VSensitiveDetector
 
       G4VSensitiveDetector & operator=(const G4VSensitiveDetector &right);
 
-      G4int operator==(const G4VSensitiveDetector &right) const;
-      G4int operator!=(const G4VSensitiveDetector &right) const;
+      G4bool operator==(const G4VSensitiveDetector &right) const;
+      G4bool operator!=(const G4VSensitiveDetector &right) const;
 
   public: // with description
       virtual void Initialize(G4HCofThisEvent*);