Import Geant4 10.0.0 source tree

source/digits_hits/utils/include/G4DefaultLinearColorMap.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4DefaultLinearColorMap.hh 67992 2013-03-13 10:59:57Z gcosmo $
 //
 
 #ifndef G4DefaultLinearColorMap_h

source/digits_hits/utils/include/G4ScoreLogColorMap.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4ScoreLogColorMap.hh 67992 2013-03-13 10:59:57Z gcosmo $
 //
 
 #ifndef G4ScoreLogColorMap_h

source/digits_hits/utils/include/G4ScoreQuantityMessenger.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4ScoreQuantityMessenger.hh 67992 2013-03-13 10:59:57Z gcosmo $
 //
 // (HISTORY)
 //  03-Sep-2007  T.Aso Command definitions are introduced.

source/digits_hits/utils/include/G4ScoringBox.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4ScoringBox.hh 68735 2013-04-05 09:49:13Z gcosmo $
 //
 
 #ifndef G4ScoringBox_h
@@ -47,7 +47,8 @@ public:
   ~G4ScoringBox();
 
 public:
-  void Construct(G4VPhysicalVolume* fWorldPhys);
+  virtual void Construct(G4VPhysicalVolume* fWorldPhys);
+
   void List() const;
   void Draw(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, G4int axflg=111);
   void DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, 
@@ -68,7 +69,6 @@ private:
 
 private:
   G4int fSegmentDirection; // =1: x, =2: y, =3: z
-  G4LogicalVolume * fMeshElementLogical;
   
 };
 

source/digits_hits/utils/include/G4ScoringCylinder.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4ScoringCylinder.hh 68735 2013-04-05 09:49:13Z gcosmo $
 //
 
 #ifndef G4ScoringCylinder_h
@@ -46,6 +46,7 @@ class G4ScoringCylinder : public G4VScoringMesh
 
   public:
       virtual void Construct(G4VPhysicalVolume* fWorldPhys);
+
       virtual void List() const;
       virtual void Draw(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, G4int axflg=111);
       virtual void DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, 
@@ -59,12 +60,13 @@ class G4ScoringCylinder : public G4VScoringMesh
   // get 3D index (z,phi,r) from sequential index
   void GetRZPhi(G4int index, G4int q[3]) const;
 
-private:
+//Xin Dong 09302011 for Scorers
+public:
+  //private:
   //enum IDX {IR, IZ, IPHI};
   enum IDX {IZ, IPHI, IR};
 
-  G4LogicalVolume * fMeshElementLogical;
-  
+private:  
   void SetupGeometry(G4VPhysicalVolume * fWorldPhys);
 };
 

source/digits_hits/utils/include/G4ScoringManager.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4ScoringManager.hh 68735 2013-04-05 09:49:13Z gcosmo $
 //
 
 #ifndef G4ScoringManager_h
@@ -82,6 +82,7 @@ class G4ScoringManager
 
   public:
       void Accumulate(G4VHitsCollection* map);
+      void Merge(const G4ScoringManager* scMan);
       G4VScoringMesh* FindMesh(const G4String&);
       void List() const;
       void Dump() const;
@@ -98,8 +99,8 @@ class G4ScoringManager
       void ListScoreColorMaps();
 
   private: 
-      static G4ScoringManager * fSManager;
-      static G4int replicaLevel;
+      static G4ThreadLocal G4ScoringManager * fSManager;
+      static G4ThreadLocal G4int replicaLevel;
       G4int verboseLevel;
       G4ScoringMessenger* fMessenger;
       G4ScoreQuantityMessenger* fQuantityMessenger;

source/digits_hits/utils/include/G4ScoringMessenger.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4ScoringMessenger.hh 78057 2013-12-03 08:31:15Z gcosmo $
 //
 // (HISTORY)
 //  03-Sep-2007  T.Aso Command definitions are introduced.
@@ -124,7 +124,7 @@ class G4ScoringMessenger: public G4UImessenger
     G4UIcmdWithoutParameter * listColorMapCmd;
     G4UIcmdWithAString *      floatMinMaxCmd;
     G4UIcommand *             colorMapMinMaxCmd;
-    G4UIcommand *             chartCmd;
+    //G4UIcommand *             chartCmd;
     //
     // Dump scoring result to file
     G4UIcommand * dumpQtyToFileCmd;

source/digits_hits/utils/include/G4VScoreColorMap.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4VScoreColorMap.hh 67992 2013-03-13 10:59:57Z gcosmo $
 //
 
 #ifndef G4VScoreColorMap_h

source/digits_hits/utils/include/G4VScoreWriter.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4VScoreWriter.hh 67992 2013-03-13 10:59:57Z gcosmo $
 //
 
 #ifndef G4VScoreWriter_h

source/digits_hits/utils/include/G4VScoringMesh.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4VScoringMesh.hh 68735 2013-04-05 09:49:13Z gcosmo $
 //
 
 #ifndef G4VScoringMesh_h
@@ -35,6 +35,7 @@
 #include "G4RotationMatrix.hh"
 
 class G4VPhysicalVolume;
+class G4LogicalVolume;
 class G4MultiFunctionalDetector;
 class G4VPrimitiveScorer;
 class G4VSDFilter;
@@ -58,6 +59,9 @@ class G4VScoringMesh
   public: // with description
   // a pure virtual function to construct this mesh geometry
   virtual void Construct(G4VPhysicalVolume* fWorldPhys)=0;
+
+  virtual void WorkerConstruct(G4VPhysicalVolume* fWorldPhys);
+
   // list infomration of this mesh 
   virtual void List() const;
   
@@ -75,7 +79,9 @@ class G4VScoringMesh
   inline MeshShape GetShape() const
   { return fShape; }
   // accumulate hits in a registered primitive scorer
-  inline void Accumulate(G4THitsMap<G4double> * map);
+  void Accumulate(G4THitsMap<G4double> * map);
+  // merge same kind of meshes
+  void Merge(const G4VScoringMesh * scMesh);
   // dump information of primitive socrers registered in this mesh
   void Dump();
   // draw a projected quantity on a current viewer
@@ -147,7 +153,8 @@ class G4VScoringMesh
   inline void SetVerboseLevel(G4int vl) 
   { verboseLevel = vl; }
   // get the primitive scorer map
-  MeshScoreMap GetScoreMap() {return fMap;}
+  inline MeshScoreMap GetScoreMap() const 
+  { return fMap; }
   // get whether this mesh setup has been ready
   inline G4bool ReadyForQuantity() const
   { return (sizeIsSet && nMeshIsSet); }
@@ -181,28 +188,15 @@ protected:
   G4String fDrawPSName;
 
   G4String fDivisionAxisNames[3];
+
+  G4LogicalVolume * fMeshElementLogical;
+
+public:
+  inline void SetMeshElementLogical(G4LogicalVolume* val)
+  { fMeshElementLogical = val; }
+  inline G4LogicalVolume* GetMeshElementLogical() const
+  { return fMeshElementLogical; }
 };
 
-void G4VScoringMesh::Accumulate(G4THitsMap<G4double> * map)
-{
-  G4String psName = map->GetName();
-  std::map<G4String, G4THitsMap<G4double>* >::const_iterator fMapItr = fMap.find(psName);
-  *(fMapItr->second) += *map;
-
-  if(verboseLevel > 9) {
-    G4cout << G4endl;
-    G4cout << "G4VScoringMesh::Accumulate()" << G4endl;
-    G4cout << "  PS name : " << psName << G4endl;
-    if(fMapItr == fMap.end()) {
-      G4cout << "  "
-	     << psName << " was not found." << G4endl;
-    } else {
-      G4cout << "  map size : " << map->GetSize() << G4endl;
-      map->PrintAllHits();
-    }
-    G4cout << G4endl;
-  }
-}
-
 #endif