Changeset 1340 for trunk/source/digits_hits/utils/src/G4ScoringBox.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/digits_hits/utils/src/G4ScoringBox.cc (modified) (11 diffs)

trunk/source/digits_hits/utils/src/G4ScoringBox.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ScoringBox.cc,v 1.54 2008/08/29 02:50:05 akimura Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ScoringBox.cc,v 1.61 2010/07/27 01:44:54 akimura Exp $
+// GEANT4 tag $Name:  $
 //
 
@@ -37 +37 @@
 #include "G4PVReplica.hh"
 #include "G4PVDivision.hh"
-#include "G4PVParameterised.hh"
 #include "G4VisAttributes.hh"
-#include "G4ScoringBoxParameterisation.hh"
 #include "G4VVisManager.hh"
 #include "G4VScoreColorMap.hh"
@@ -57 +55 @@
 {
   fShape = boxMesh;
+  fDivisionAxisNames[0] = "X";
+  fDivisionAxisNames[1] = "Y";
+  fDivisionAxisNames[2] = "Z";
 }
 
@@ -186 +187 @@
                                       fSize[2]/fNSegment[2]);
   fMeshElementLogical = new G4LogicalVolume(elementSolid, 0, elementName);
-  if(fNSegment[2] > 1) 
-    if(fSegmentPositions.size() > 0) {
-      if(verboseLevel > 9) G4cout << "G4ScoringBox::Construct() : Parameterise to z direction" << G4endl;
-      G4double motherDims[3] ={fSize[0]/fNSegment[0],
-                               fSize[1]/fNSegment[1],
-                               fSize[2]/fNSegment[2]};
-      G4int nelement = fNSegment[2];
-      fSegmentPositions.push_back(fSize[2]*2.);
-      //G4ScoringBoxParameterisation * param =
-      G4VPVParameterisation * param =
-        new G4ScoringBoxParameterisation(kZAxis, motherDims, fSegmentPositions);
-      new G4PVParameterised(elementName,
-                            fMeshElementLogical,
-                            layerLogical[1],
-                            kZAxis,
-                            nelement,
-                            param);
-
-      if(verboseLevel > 9) {
-        G4cout << motherDims[0] << ", " << motherDims[1] << ", " << motherDims[2] << G4endl;
-        for(int i = 0; i < (int)fSegmentPositions.size(); i++)
-          G4cout << fSegmentPositions[i] << ", ";
-        G4cout << G4endl;
-      }
-
-    } else {
-      if(verboseLevel > 9) G4cout << "G4ScoringBox::Construct() : Replicate to z direction" << G4endl;
-
-      if(G4ScoringManager::GetReplicaLevel()>2)
-      { 
-        new G4PVReplica(elementName, fMeshElementLogical, layerLogical[1], kZAxis,
+  if(fNSegment[2] > 1) {
+    if(verboseLevel > 9) G4cout << "G4ScoringBox::Construct() : Replicate to z direction" << G4endl;
+
+    if(G4ScoringManager::GetReplicaLevel()>2) 
+    { 
+      new G4PVReplica(elementName, fMeshElementLogical, layerLogical[1], kZAxis,
                       fNSegment[2], 2.*fSize[2]/fNSegment[2]);
-      }
-      else
-      {
-        new G4PVDivision(elementName, fMeshElementLogical, layerLogical[1], kZAxis,
-                      fNSegment[2], 0.);
-      }
-    }
-  else if(fNSegment[2] == 1) {
+    }
+    else
+    {
+      new G4PVDivision(elementName, fMeshElementLogical, layerLogical[1], kZAxis,
+                       fNSegment[2], 0.);
+    }
+  } else if(fNSegment[2] == 1) {
     if(verboseLevel > 9) G4cout << "G4ScoringBox::Construct() : Placement" << G4endl;
     new G4PVPlacement(0, G4ThreeVector(0.,0.,0.), fMeshElementLogical, elementName, layerLogical[1], false, 0);
@@ -292 +267 @@
     for(int x = 0; x < fNSegment[0]; x++) xzcell.push_back(ez);
 
+    // search max. & min. values in each slice
     G4double xymin = DBL_MAX, yzmin = DBL_MAX, xzmin = DBL_MAX;
     G4double xymax = 0., yzmax = 0., xzmax = 0.;
@@ -299 +275 @@
       GetXYZ(itr->first, q);
 
-      xycell[q[0]][q[1]] += *(itr->second);
+      xycell[q[0]][q[1]] += *(itr->second)/fDrawUnitValue;
       if(xymin > xycell[q[0]][q[1]]) xymin = xycell[q[0]][q[1]];
       if(xymax < xycell[q[0]][q[1]]) xymax = xycell[q[0]][q[1]];
 
-      yzcell[q[1]][q[2]] += *(itr->second);
+      yzcell[q[1]][q[2]] += *(itr->second)/fDrawUnitValue;
       if(yzmin > yzcell[q[1]][q[2]]) yzmin = yzcell[q[1]][q[2]];
       if(yzmax < yzcell[q[1]][q[2]]) yzmax = yzcell[q[1]][q[2]];
 
-      xzcell[q[0]][q[2]] += *(itr->second);
+      xzcell[q[0]][q[2]] += *(itr->second)/fDrawUnitValue;
       if(xzmin > xzcell[q[0]][q[2]]) xzmin = xzcell[q[0]][q[2]];
       if(xzmax < xzcell[q[0]][q[2]]) xzmax = xzcell[q[0]][q[2]];
@@ -404 +380 @@
     }
   }
+  colorMap->SetPSUnit(fDrawUnit);
+  colorMap->SetPSName(fDrawPSName);
   colorMap->DrawColorChart();
 }
@@ -429 +407 @@
 }
 
-void G4ScoringBox::DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, 
-                          G4int idxProj, G4int idxColumn) 
+void G4ScoringBox::DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap,
+                              G4int idxProj, G4int idxColumn) 
 {
   if(idxColumn<0 || idxColumn>=fNSegment[idxProj])
@@ -460 +438 @@
     for(int x = 0; x < fNSegment[0]; x++) xzcell.push_back(ez);
 
+    // search max. & min. values in each slice
     G4double xymax = 0., yzmax = 0., xzmax = 0.;
     G4int q[3];
@@ -467 +446 @@
 
       if(idxProj == 0 && q[2] == idxColumn) { // xy plane
-        xycell[q[0]][q[1]] += *(itr->second);
+        xycell[q[0]][q[1]] += *(itr->second)/fDrawUnitValue;
         if(xymax < xycell[q[0]][q[1]]) xymax = xycell[q[0]][q[1]];
       }
       if(idxProj == 1 && q[0] == idxColumn) { // yz plane
-        yzcell[q[1]][q[2]] += *(itr->second);
+        yzcell[q[1]][q[2]] += *(itr->second)/fDrawUnitValue;
         if(yzmax < yzcell[q[1]][q[2]]) yzmax = yzcell[q[1]][q[2]];
       }
       if(idxProj == 2 && q[1] == idxColumn) { // zx plane
-        xzcell[q[0]][q[2]] += *(itr->second);
+        xzcell[q[0]][q[2]] += *(itr->second)/fDrawUnitValue;
         if(xzmax < xzcell[q[0]][q[2]]) xzmax = xzcell[q[0]][q[2]];
       }
@@ -552 +531 @@
   }
 
+  colorMap->SetPSUnit(fDrawUnit);
+  colorMap->SetPSName(fDrawPSName);
   colorMap->DrawColorChart();
 }