Import Geant4 10.6.0 source tree

source/readout/include/G4DigiManager.hh

@@ -23,11 +23,20 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
+// G4DigiManager
 //
+// class description:
 //
+// This is a singleton class which manages the digitizer modules.
+// The user cannot access to the constructor. The pointer of the
+// only existing object can be got via G4DigiManager::GetDMpointer()
+// static method. The first invokation in the program makes the 
+// singleton object.
 
-#ifndef G4DigiManager_h
-#define G4DigiManager_h 1
+// Author: M.Asai
+// --------------------------------------------------------------------
+#ifndef G4DigiManager_hh
+#define G4DigiManager_hh 1
 
 #include "globals.hh"
 class G4Event;
@@ -38,33 +47,24 @@ class G4DMmessenger;
 #include "G4DCtable.hh"
 class G4RunManager;
 class G4SDManager;
-//#include "g4rw/tpordvec.h"
 #include <vector>
 
-// class description:
-//
-//  This is a singleton class which manages the digitizer modules.
-// The user cannot access to the constructor. The pointer of the
-// only existing object can be got via G4DigiManager::GetDMpointer()
-// static method. The first invokation in the program makes the 
-// singleton object.
-//
-
 class G4DigiManager 
 {
   public: // with description
+
       static G4DigiManager* GetDMpointer();
       // Returns the pointer to the singleton object
-  public:
+
       static G4DigiManager* GetDMpointerIfExist();
 
-  protected:
-      G4DigiManager();
-
-  public:
       ~G4DigiManager();
 
+      G4DigiManager(const G4DigiManager&) = delete;
+      G4DigiManager& operator=(const G4DigiManager&) = delete;
+
   public: // with description
+
       void AddNewModule(G4VDigitizerModule* DM); 
       //  Registers the user's digitizer mudule. This method must be invoked when
       // the user construct his/her digitizer module(s).
@@ -97,25 +97,16 @@ class G4DigiManager
       // To set digi collection, the user must use SetDigiCollection of G4VDigitizerModule.
 
   public:
+
       void SetVerboseLevel(G4int vl);
       void List() const;
 
-  private: 
-      static G4ThreadLocal G4DigiManager * fDManager;
-      G4int verboseLevel;
-      std::vector<G4VDigitizerModule*> DMtable;
-      G4DCtable* DCtable;
-      G4DMmessenger* theMessenger;
-      G4RunManager* runManager;
-      G4SDManager* SDManager;
-
-  public:
       inline G4int GetVerboseLevel() const
       { return verboseLevel; }
       inline G4int GetCollectionCapacity() const
       { return DCtable->entries(); }
       inline G4int GetModuleCapacity() const
-      { return DMtable.size(); }
+      { return G4int(DMtable.size()); }
       inline G4DCtable* GetDCtable() const
       { return DCtable; }
       inline void RestoreDCtable(G4DCtable* dc)
@@ -123,14 +114,20 @@ class G4DigiManager
         if(DCtable) delete DCtable;
         DCtable = dc;
       }
+
+  protected:
+
+      G4DigiManager();
+
   private:
-     //Disable copy constructor and assignement operator
-     G4DigiManager(const G4DigiManager&);
-     G4DigiManager& operator=(const G4DigiManager&);
+
+      static G4ThreadLocal G4DigiManager * fDManager;
+      G4int verboseLevel;
+      std::vector<G4VDigitizerModule*> DMtable;
+      G4DCtable* DCtable;
+      G4DMmessenger* theMessenger;
+      G4RunManager* runManager;
+      G4SDManager* SDManager;
 };
 
-
-
-
 #endif
-