Import Geant4 10.1.0 source tree

source/digits_hits/utils/src/G4VScoringMesh.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4VScoringMesh.cc 68735 2013-04-05 09:49:13Z gcosmo $
+// $Id: G4VScoringMesh.cc 83518 2014-08-27 12:57:10Z gcosmo $
 //
 // ---------------------------------------------------------------------
 // Modifications                                                        
@@ -44,10 +44,11 @@
 #include "G4SDManager.hh"
 
 G4VScoringMesh::G4VScoringMesh(const G4String& wName)
-  : fWorldName(wName),fCurrentPS(0),fConstructed(false),fActive(true),
+  : fWorldName(wName),fCurrentPS(0),fConstructed(false),fActive(true),fShape(undefinedMesh),
     fRotationMatrix(0), fMFD(new G4MultiFunctionalDetector(wName)),
     verboseLevel(0),sizeIsSet(false),nMeshIsSet(false),
-    fDrawUnit(""), fDrawUnitValue(1.), fMeshElementLogical(0)
+    fDrawUnit(""), fDrawUnitValue(1.), fMeshElementLogical(0),
+    fParallelWorldProcess(0), fGeometryHasBeenDestroyed(false)
 {
   G4SDManager::GetSDMpointer()->AddNewDetector(fMFD);
 
@@ -332,9 +333,31 @@ void G4VScoringMesh::Accumulate(G4THitsMap<G4double> * map)
   }
 }
 
+void G4VScoringMesh::Construct(G4VPhysicalVolume* fWorldPhys)
+{
+  if(fConstructed) {
+    if(fGeometryHasBeenDestroyed) {
+      SetupGeometry(fWorldPhys);
+      fGeometryHasBeenDestroyed = false;
+    }
+    if(verboseLevel > 0)
+      G4cout << fWorldPhys->GetName() << " --- All quantities are reset."
+      << G4endl;
+    ResetScore();
+  }
+  else {
+    fConstructed = true;
+    SetupGeometry(fWorldPhys);
+  }
+}
+
 void G4VScoringMesh::WorkerConstruct(G4VPhysicalVolume* fWorldPhys)
 {
   if(fConstructed) {
+    if(fGeometryHasBeenDestroyed) {
+      fMeshElementLogical->SetSensitiveDetector(fMFD);
+      fGeometryHasBeenDestroyed = false;
+    }
 
     if(verboseLevel > 0)
       G4cout << fWorldPhys->GetName() << " --- All quantities are reset." << G4endl;