Changeset 1161

Timestamp:

Nov 10, 2009, 3:19:51 PM (15 years ago)

Author:

garnier

Message:

gMocren update

Location:

trunk/source/visualization/gMocren

Files:

• History (modified) (3 diffs)
• src/G4GMocrenFileSceneHandler.cc (modified) (6 diffs)
• src/G4GMocrenIO.cc (modified) (2 diffs)

trunk/source/visualization/gMocren/History

@@ -1 @@
-$Id: History,v 1.4 2009/11/02 04:59:07 akimura Exp $
+$Id: History,v 1.7 2009/11/05 11:37:12 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -21 +21 @@
 ---------------------------------------------------
 
-2 Novemeber 2009  Akinori Kimura
+5 November 2009  Gabriele Cosmo (gMocren-V09-02-03)
+Fix in G4GMocrenFileSceneHandler.cc for resolving compilation error on
+Windows
+
+5 November 2009  Akinori Kimura
+GMocrenFileSceneHandler::AddCompound(G4THisMap<>) was modified
+to deal with /vis/scene/add/psHits <scorer_name>.
+GMocrenIO.cc was modified to remove an unnecessary output by std::cout.
+
+2 November 2009  Akinori Kimura (gMocren-V09-02-02)
+I mistook to make a tag, gMocren-V09-02-01.
+So I made a tag again.
+
+
+2 November 2009  Akinori Kimura (gMocren-V09-02-01)
 Deleted the following two AddEndOfEventModel(*) in
 G4GMocrenFileSceneHandler::GFBeginModeling().
@@ -30 +44 @@
 
 
-1 Novemeber 2009  Akinori Kimura
+1 November 2009  Akinori Kimura
 A few warning as following were fixed.
 src/G4GMocrenFileSceneHandler.cc:1812: warning: dereferencing pointer '<anonymous>' does break strict-aliasing rules

trunk/source/visualization/gMocren/src/G4GMocrenFileSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GMocrenFileSceneHandler.cc,v 1.8 2009/11/02 04:59:07 akimura Exp $
+// $Id: G4GMocrenFileSceneHandler.cc,v 1.10 2009/11/05 11:34:01 gcosmo Exp $
 // GEANT4 tag $Name:  $
 //
@@ -120 +120 @@
     kbSetModalityVoxelSize(false),
     kbModelingTrajectory(false),
-    kGddDest(0),
+//    kGddDest(0),
     kFlagInModeling(false),
     kFlagSaving_g4_gdd(false),
@@ -1590 +1590 @@
   G4String scorername = static_cast<G4VHitsCollection>(hits).GetName();
 
-  if(GFDEBUG_HIT) {
-    G4String meshname = static_cast<G4VHitsCollection>(hits).GetSDname();
-    G4cout << "       >>>>> " << meshname << " : " << scorername  << G4endl;
-
-    for(int i = 0; i < nhitname; i++)
-      if(scorername == hitScorerNames[i]) 
-        G4cout << "       !!!! Hit scorer !!!! " << scorername << G4endl;
-
-    G4cout << " dimension: "
-           << kNestedVolumeDimension[0] << " x "
-           << kNestedVolumeDimension[1] << " x "
-           << kNestedVolumeDimension[2] << G4endl;
-
-    G4int id[3];
-    std::map<G4int, G4double*> * map = hits.GetMap();
-    std::map<G4int, G4double*>::const_iterator itr = map->begin();
-    for(; itr != map->end(); itr++) {
-      GetNestedVolumeIndex(itr->first, id);
-      G4cout << "[" << itr->first << "] "
-             << "("<< id[0] << "," << id[1] << "," << id[2] << ")"
-             << *itr->second << ", ";
-    }
-    G4cout << G4endl;
-  }
-
   //-- --//
   /*
@@ -1626 +1601 @@
   
 
-  for(int i = 0; i < nhitname; i++) {
-    if(scorername == hitScorerNames[i]) {
+  //for(int i = 0; i < nhitname; i++) {       // this selection trusts
+    //if(scorername == hitScorerNames[i]) {   // thea command /vis/scene/add/psHits hit_name.
 
       G4int idx[3];
@@ -1635 +1610 @@
         GetNestedVolumeIndex(itr->first, idx);
         Index3D id(idx[0], idx[1], idx[2]);
-        //Index3D id;
-        //id.x = idx[0]; id.y = idx[1]; id.z = idx[2];
         
         std::map<G4String, std::map<Index3D, G4double> >::iterator nestedHitsListItr;
@@ -1648 +1621 @@
         }
       }
-      break;
-    }
-  }
+ 
+      //break;
+    //}
+  //}
+
+  if(GFDEBUG_HIT) {
+    G4String meshname = static_cast<G4VHitsCollection>(hits).GetSDname();
+    G4cout << "       >>>>> " << meshname << " : " << scorername  << G4endl;
+
+    for(int i = 0; i < nhitname; i++)
+      if(scorername == hitScorerNames[i]) 
+        G4cout << "       !!!! Hit scorer !!!! " << scorername << G4endl;
+
+    G4cout << " dimension: "
+           << kNestedVolumeDimension[0] << " x "
+           << kNestedVolumeDimension[1] << " x "
+           << kNestedVolumeDimension[2] << G4endl;
+
+    G4int id[3];
+    std::map<G4int, G4double*> * map = hits.GetMap();
+    std::map<G4int, G4double*>::const_iterator itr = map->begin();
+    for(; itr != map->end(); itr++) {
+      GetNestedVolumeIndex(itr->first, id);
+      G4cout << "[" << itr->first << "] "
+             << "("<< id[0] << "," << id[1] << "," << id[2] << ")"
+             << *itr->second << ", ";
+    }
+    G4cout << G4endl;
+  }
+
 }
 

trunk/source/visualization/gMocren/src/G4GMocrenIO.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GMocrenIO.cc,v 1.3 2009/10/18 04:02:09 akimura Exp $
+// $Id: G4GMocrenIO.cc,v 1.4 2009/11/05 03:14:12 akimura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -3685 +3685 @@
 bool G4GMocrenIO::isDoseEmpty() {
   if(kDose.empty()) {
-    std::cerr << "!!! dose distribution data is empty." << std::endl;
+    //std::cerr << "!!! dose distribution data is empty." << std::endl;
     return true;
   } else {