Changeset 1171 for trunk

Timestamp:

Nov 16, 2009, 5:03:28 PM (15 years ago)

Author:

garnier

Message:

update contre CVS

Location:

trunk/source/visualization/modeling

Files:

• GNUmakefile (modified) (2 diffs)
• History (modified) (2 diffs)
• include/G4PSHitsModel.hh (modified) (4 diffs)
• src/G4LogicalVolumeModel.cc (modified) (1 diff)
• src/G4PSHitsModel.cc (modified) (3 diffs)
• src/G4PhysicalVolumeModel.cc (modified) (1 diff)
• src/G4TrajectoryDrawerUtils.cc (modified) (1 diff)

trunk/source/visualization/modeling/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.11 2006/05/22 08:49:27 allison Exp $
+# $Id: GNUmakefile,v 1.12 2009/11/04 12:44:39 allison Exp $
 # --------------------------------------------------------------
 # GNUmakefile for modeling library.  John Allison, 31/12/1997.
@@ -32 +32 @@
 CPPFLAGS += -I$(G4BASE)/particles/management/include
 CPPFLAGS += -I$(G4BASE)/event/include
+CPPFLAGS += -I$(G4BASE)/digits_hits/utils/include
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
 CPPFLAGS += -I$(G4BASE)/digits_hits/digits/include

trunk/source/visualization/modeling/History

@@ -1 @@
-$Id: History,v 1.114 2009/10/22 15:40:00 allison Exp $
+$Id: History,v 1.115 2009/11/04 12:44:39 allison Exp $
 -------------------------------------------------------------------
 
@@ -21 +21 @@
 ---------------------------------------
 
+4th November 2009  John Allison
+- G4PSHitsModel:
+  o Now intended as end-of-run model.
+  o Picks up hits from G4ScoringManager instead of event.
+
 22nd October 2009  John Allison  (modeling-V09-02-05 coworks greps-V09-02-02)
 - Added G4PSHitsModel for gMocren driver.
+- G4PhysicalVolumeModel.cc: Makes use of HepPolyhedronProcessor.
 
 21st October 2009  John Allison  (modeling-V09-02-04 coworks greps-V09-02-02)

trunk/source/visualization/modeling/include/G4PSHitsModel.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4PSHitsModel.hh,v 1.3 2009/10/22 07:35:06 akimura Exp $
+// $Id: G4PSHitsModel.hh,v 1.4 2009/11/04 12:44:39 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -39 +39 @@
 #include "G4VModel.hh"
 
-class G4VHit;
+template <typename T> class G4THitsMap;
 
 class G4PSHitsModel: public G4VModel {
@@ -45 +45 @@
 public: // With description
 
-  G4PSHitsModel ();
+  G4PSHitsModel (const G4String& requestedMapName = "all");
    
   virtual ~G4PSHitsModel ();
@@ -52 +52 @@
   // The main task of a model is to describe itself to the graphics scene.
 
-  const G4VHit* GetCurrentHit() const
-  {return kpCurrentHit;}
+  const G4THitsMap<G4double>* GetCurrentHits() const
+  {return fpCurrentHits;}
 
 private:
 
-  const G4VHit* kpCurrentHit;
+  G4String fRequestedMapName;
+  const G4THitsMap<G4double>* fpCurrentHits;
 };
 

trunk/source/visualization/modeling/src/G4LogicalVolumeModel.cc

@@ -102 +102 @@
         const G4Polyhedron& polyhedron = (*pPPL)[i].GetPolyhedron ();
         sceneHandler.BeginPrimitives (transform);
-        sceneHandler.AddPrimitive (polyhedron);
+        sceneHandler.AddPrimitive (polyhedron);
         sceneHandler.EndPrimitives ();
       }

trunk/source/visualization/modeling/src/G4PSHitsModel.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PSHitsModel.cc,v 1.3 2009/10/22 07:35:06 akimura Exp $
+// $Id: G4PSHitsModel.cc,v 1.4 2009/11/04 12:44:39 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -38 +38 @@
 #include "G4VGraphicsScene.hh"
 #include "G4Event.hh"
-#include "G4THitsMap.hh"
+#include "G4ScoringManager.hh"
 
 G4PSHitsModel::~G4PSHitsModel () {}
 
-G4PSHitsModel::G4PSHitsModel ():
-  kpCurrentHit(0)
+G4PSHitsModel::G4PSHitsModel (const G4String& requestedMapName):
+  fRequestedMapName(requestedMapName), fpCurrentHits(0)
 {
   fGlobalTag = "G4PSHitsModel for G4THitsMap<G4double> hits.";
@@ -51 +51 @@
 void G4PSHitsModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler)
 {
-  const G4Event* event = fpMP->GetEvent();
-  if (event) {
-    G4HCofThisEvent * HCE = event->GetHCofThisEvent();
-    if (HCE) {
-      G4int nHC = HCE -> GetCapacity ();
-      for (int iHC = 0; iHC < nHC; iHC++) {
-        G4THitsMap<G4double> * hits = dynamic_cast<G4THitsMap<G4double> *>(HCE -> GetHC (iHC));
-        if(hits) sceneHandler.AddCompound (*hits);
-        
+  G4ScoringManager* scoringManager =
+    G4ScoringManager::GetScoringManagerIfExist();
+  if (scoringManager) {
+    size_t nMeshes = scoringManager->GetNumberOfMesh();
+    for (size_t i = 0; i < nMeshes; ++i) {
+      G4VScoringMesh* mesh = scoringManager->GetMesh(i);
+      if (mesh && mesh->IsActive()) {
+        MeshScoreMap scoreMap = mesh->GetScoreMap();
+        for(MeshScoreMap::const_iterator i = scoreMap.begin();
+            i != scoreMap.end(); ++i) {
+          const G4String& name = i->first;
+          if (fRequestedMapName == "all" || name == fRequestedMapName) {
+            fpCurrentHits = i->second;
+            //G4cout << name << ": " << fpCurrentHits << G4endl;
+            if (fpCurrentHits) sceneHandler.AddCompound(*fpCurrentHits);
+          }
+        }
       }
     }

trunk/source/visualization/modeling/src/G4PhysicalVolumeModel.cc

@@ -740 +740 @@
 
   values->push_back(G4AttValue("PVPath", oss.str(),""));
-  if (fpCurrentLV) {
-    values->push_back(G4AttValue("LVol", fpCurrentLV->GetName(),""));
-    G4VSolid* pSol = fpCurrentLV->GetSolid();
-    values->push_back(G4AttValue("Solid", pSol->GetName(),""));
-    values->push_back(G4AttValue("EType", pSol->GetEntityType(),""));
-    oss.str(""); oss << '\n' << *pSol;
-    values->push_back(G4AttValue("DmpSol", oss.str(),""));
-    oss.str(""); oss << '\n' << *fpCurrentTransform;
-    values->push_back(G4AttValue("Trans", oss.str(),""));
-    G4String matName = fpCurrentMaterial? fpCurrentMaterial->GetName(): G4String("No material");
-    values->push_back(G4AttValue("Material", matName,""));
-    G4double matDensity = fpCurrentMaterial? fpCurrentMaterial->GetDensity(): 0.;
-    values->push_back(G4AttValue("Density", G4BestUnit(matDensity,"Volumic Mass"),""));
-    G4State matState = fpCurrentMaterial? fpCurrentMaterial->GetState(): kStateUndefined;
-    oss.str(""); oss << matState;
-    values->push_back(G4AttValue("State", oss.str(),""));
-    G4double matRadlen = fpCurrentMaterial? fpCurrentMaterial->GetRadlen(): 0.;
-    values->push_back(G4AttValue("Radlen", G4BestUnit(matRadlen,"Length"),""));
-    G4Region* region = fpCurrentLV->GetRegion();
-    G4String regionName = region? region->GetName(): G4String("No region");
-    values->push_back(G4AttValue("Region", regionName,""));
-    oss.str(""); oss << fpCurrentLV->IsRootRegion();
-    values->push_back(G4AttValue("RootRegion", oss.str(),""));
-  }
+  values->push_back(G4AttValue("LVol", fpCurrentLV->GetName(),""));
+  G4VSolid* pSol = fpCurrentLV->GetSolid();
+  values->push_back(G4AttValue("Solid", pSol->GetName(),""));
+  values->push_back(G4AttValue("EType", pSol->GetEntityType(),""));
+  oss.str(""); oss << '\n' << *pSol;
+  values->push_back(G4AttValue("DmpSol", oss.str(),""));
+  oss.str(""); oss << '\n' << *fpCurrentTransform;
+  values->push_back(G4AttValue("Trans", oss.str(),""));
+  G4String matName = fpCurrentMaterial? fpCurrentMaterial->GetName(): G4String("No material");
+  values->push_back(G4AttValue("Material", matName,""));
+  G4double matDensity = fpCurrentMaterial? fpCurrentMaterial->GetDensity(): 0.;
+  values->push_back(G4AttValue("Density", G4BestUnit(matDensity,"Volumic Mass"),""));
+  G4State matState = fpCurrentMaterial? fpCurrentMaterial->GetState(): kStateUndefined;
+  oss.str(""); oss << matState;
+  values->push_back(G4AttValue("State", oss.str(),""));
+  G4double matRadlen = fpCurrentMaterial? fpCurrentMaterial->GetRadlen(): 0.;
+  values->push_back(G4AttValue("Radlen", G4BestUnit(matRadlen,"Length"),""));
+  G4Region* region = fpCurrentLV->GetRegion();
+  G4String regionName = region? region->GetName(): G4String("No region");
+  values->push_back(G4AttValue("Region", regionName,""));
+  oss.str(""); oss << fpCurrentLV->IsRootRegion();
+  values->push_back(G4AttValue("RootRegion", oss.str(),""));
   return values;
 }

trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc

@@ -241 +241 @@
     // Draw without time slice information
 
-    //
-//     for (size_t iPoint = 0; iPoint < trajectoryLine.size (); iPoint++) {
-//       printf("DrawLineAndPoints trajectory i:%d/%d center:%f,%f,%f\n",iPoint,trajectoryLine.size (),trajectoryLine[iPoint].x(),trajectoryLine[iPoint].y(),trajectoryLine[iPoint].z());
-//     }
-//     for (size_t iPoint = 0; iPoint < auxiliaryPoints.size (); iPoint++) {
-//       printf("DrawLineAndPoints aux i:%d/%d center:%f,%f,%f\n",iPoint,auxiliaryPoints.size (),auxiliaryPoints[iPoint].x(),auxiliaryPoints[iPoint].y(),auxiliaryPoints[iPoint].z());
-//     }
-//     for (size_t iPoint = 0; iPoint < stepPoints.size (); iPoint++) {
-//       printf("DrawLineAndPoints step i:%d/%d center:%f,%f,%f\n",iPoint,stepPoints.size (),stepPoints[iPoint].x(),stepPoints[iPoint].y(),stepPoints[iPoint].z());
-//     }
-    //    
     G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
     if (0 == pVVisManager) return;