Changeset 1140 for trunk/source/digits_hits/utils

Timestamp:

Nov 3, 2009, 11:17:28 AM (15 years ago)

Author:

garnier

Message:

update to CVS

Location:

trunk/source/digits_hits/utils

Files:

• include/G4VScoringMesh.hh (modified) (3 diffs)
• src/G4ScoreLogColorMap.cc (modified) (2 diffs)
• src/G4VScoreColorMap.cc (modified) (2 diffs)
• src/G4VScoringMesh.cc (modified) (2 diffs)

trunk/source/digits_hits/utils/include/G4VScoringMesh.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VScoringMesh.hh,v 1.27 2007/11/06 17:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VScoringMesh.hh,v 1.29 2009/10/12 04:11:25 akimura Exp $
+// GEANT4 tag $Name:  $
 //
 
@@ -94 +94 @@
   // set size of this mesh
   void SetSize(G4double size[3]);
+  // get size of this mesh
+  G4ThreeVector GetSize() const;
   // set position of center of this mesh
   void SetCenterPosition(G4double centerPosition[3]);
+  // get position of center of this mesh
+  G4ThreeVector GetTranslation() const {return fCenterPosition;}
   // set a rotation angle around the x axis
   void RotateX(G4double delta);
@@ -102 +106 @@
   // set a rotation angle around the z axis
   void RotateZ(G4double delta);
+  // get a rotation matrix
+  G4RotationMatrix GetRotationMatrix() const {
+    if(fRotationMatrix) return *fRotationMatrix;
+    else return G4RotationMatrix::IDENTITY;
+  }
   // set number of segments of this mesh
   void SetNumberOfSegments(G4int nSegment[3]);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ScoreLogColorMap.cc,v 1.2 2008/03/25 04:06:08 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ScoreLogColorMap.cc,v 1.3 2009/05/04 15:57:33 akimura Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4ScoreLogColorMap.hh"
 #include <cmath>
+#include <string>
+#include <sstream>
+#include <iomanip>
 
 
@@ -152 +155 @@
     }
     // text
-    char cstring[80]; 
-    std::sprintf(cstring, "%8.1e", std::pow(10., v));
-    G4String value(cstring);
+    //char cstring[80]; 
+    //std::sprintf(cstring, "%8.1e", std::pow(10., v));
+    //G4String value(cstring);
+    std::ostringstream oss;
+    oss << std::setw(8) << std::setprecision(1) << std::scientific << std::pow(10., v);
+    std::string str = oss.str();
+    G4String value(str.c_str());
     G4Text text(value, G4Point3D(-0.9, -0.9+0.05*n, 0));
     G4double size = 12.;

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VScoreColorMap.cc,v 1.3 2008/02/14 10:45:12 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VScoreColorMap.cc,v 1.4 2009/05/04 15:57:33 akimura Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VScoreColorMap.hh"
+#include <string>
+#include <sstream>
+#include <iomanip>
 
 #include "G4VVisManager.hh"
@@ -94 +97 @@
     }
     // text
-    char cstring[80]; 
-    std::sprintf(cstring, "%8.2e", v);
-    G4String value(cstring);
+    //char cstring[80]; 
+    //std::sprintf(cstring, "%8.2e", v);
+    //G4String value(cstring);
+    std::ostringstream oss;
+    oss << std::setw(8) << std::setprecision(1) << std::scientific << v;
+    std::string str = oss.str();
+    G4String value(str.c_str());
+
     G4Text text(value, G4Point3D(-0.9, -0.9+0.05*n, 0));
     G4double size = 12.;

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VScoringMesh.cc,v 1.35 2008/03/23 14:32:13 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VScoringMesh.cc,v 1.37 2009/10/12 04:11:25 akimura Exp $
+// GEANT4 tag $Name:  $
 //
 
@@ -63 +63 @@
   for(int i = 0; i < 3; i++) fSize[i] = size[i];
   sizeIsSet = true;
+}
+G4ThreeVector G4VScoringMesh::GetSize() const {
+  if(sizeIsSet)
+    return G4ThreeVector(fSize[0], fSize[1], fSize[2]);
+  else
+    return G4ThreeVector(0., 0., 0.);
 }
 void G4VScoringMesh::SetCenterPosition(G4double centerPosition[3]) {