From e659b8c25f9d32955d4ce826f82f1c9ddc8039a8 Mon Sep 17 00:00:00 2001
From: matta-mac <matta-mac@npt>
Date: Sat, 13 Nov 2010 14:04:38 +0000
Subject: [PATCH] * Few change to allow copilation - Line to remove in the
modified file
---
NPSimulation/src/GaspardTrackerDummyShape.cc | 2 +-
NPSimulation/src/GaspardTrackerSquare.cc | 2 +-
NPSimulation/src/GaspardTrackerTrapezoid.cc | 2 +-
NPSimulation/src/ParisCluster.cc | 2 +-
NPSimulation/src/ParisPhoswich.cc | 2 +-
NPSimulation/src/ShieldClParis.cc | 2 +-
NPSimulation/src/ShieldPhParis.cc | 2 +-
NPSimulation/vis.mac | 21 ++++++++++----------
8 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/NPSimulation/src/GaspardTrackerDummyShape.cc b/NPSimulation/src/GaspardTrackerDummyShape.cc
index 1867e685e..d480e0685 100644
--- a/NPSimulation/src/GaspardTrackerDummyShape.cc
+++ b/NPSimulation/src/GaspardTrackerDummyShape.cc
@@ -561,7 +561,7 @@ void GaspardTrackerDummyShape::ConstructDetector(G4LogicalVolume* world)
MMv = m_X1_Y128[i] - m_X1_Y1[i];
MMv = MMv.unit();
- G4ThreeVector MMscal = MMu.dot(MMv);
+ Double_t MMscal = MMu.dot(MMv);
MMw = MMu.cross(MMv);
// if (MMw.z() > 0) MMw = MMv.cross(MMu) ;
diff --git a/NPSimulation/src/GaspardTrackerSquare.cc b/NPSimulation/src/GaspardTrackerSquare.cc
index 71e021a8e..f1fc8fa1e 100644
--- a/NPSimulation/src/GaspardTrackerSquare.cc
+++ b/NPSimulation/src/GaspardTrackerSquare.cc
@@ -743,7 +743,7 @@ void GaspardTrackerSquare::ConstructDetector(G4LogicalVolume* world)
MMv = MMv.unit() ;
G4cout << "Norm MMv X = " << MMv(0) << " , Y = " << MMv(1) << " , Z = " << MMv(2) << G4endl;
- G4ThreeVector MMscal = MMu.dot(MMv);
+ double MMscal = MMu.dot(MMv);
G4cout << "Norm MMu.MMv X = " << MMv(0) << " , Y = " << MMv(1) << " , Z = " << MMv(2) << G4endl;
MMw = MMu.cross(MMv) ;
diff --git a/NPSimulation/src/GaspardTrackerTrapezoid.cc b/NPSimulation/src/GaspardTrackerTrapezoid.cc
index 1a501934a..88b407610 100644
--- a/NPSimulation/src/GaspardTrackerTrapezoid.cc
+++ b/NPSimulation/src/GaspardTrackerTrapezoid.cc
@@ -635,7 +635,7 @@ void GaspardTrackerTrapezoid::ConstructDetector(G4LogicalVolume* world)
MMv = MMv.unit() ;
G4cout << "Norm MMv: " << MMv << G4endl;
- G4ThreeVector MMscal = MMu.dot(MMv);
+ double MMscal = MMu.dot(MMv);
G4cout << "Norm MMu.MMv: " << MMscal << G4endl;
MMw = MMu.cross(MMv) ;
diff --git a/NPSimulation/src/ParisCluster.cc b/NPSimulation/src/ParisCluster.cc
index 464b611fe..4d3e464d7 100644
--- a/NPSimulation/src/ParisCluster.cc
+++ b/NPSimulation/src/ParisCluster.cc
@@ -564,7 +564,7 @@ void ParisCluster::ConstructDetector(G4LogicalVolume* world)
MMv = m_X1_Y128[i] - m_X1_Y1[i];
MMv = MMv.unit();
- G4ThreeVector MMscal = MMu.dot(MMv);
+ double MMscal = MMu.dot(MMv);
MMw = MMu.cross(MMv);
// if (MMw.z() > 0) MMw = MMv.cross(MMu) ;
diff --git a/NPSimulation/src/ParisPhoswich.cc b/NPSimulation/src/ParisPhoswich.cc
index cd7a6a4f4..606fd11b9 100644
--- a/NPSimulation/src/ParisPhoswich.cc
+++ b/NPSimulation/src/ParisPhoswich.cc
@@ -475,7 +475,7 @@ void ParisPhoswich::ConstructDetector(G4LogicalVolume* world)
MMv = m_X1_Y128[i] - m_X1_Y1[i];
MMv = MMv.unit();
- G4ThreeVector MMscal = MMu.dot(MMv);
+ double MMscal = MMu.dot(MMv);
MMw = MMu.cross(MMv);
// if (MMw.z() > 0) MMw = MMv.cross(MMu) ;
diff --git a/NPSimulation/src/ShieldClParis.cc b/NPSimulation/src/ShieldClParis.cc
index 2b77daa18..ed080a523 100644
--- a/NPSimulation/src/ShieldClParis.cc
+++ b/NPSimulation/src/ShieldClParis.cc
@@ -463,7 +463,7 @@ void ShieldClParis::ConstructDetector(G4LogicalVolume* world)
//MMv = -0.5 * (m_X1_Y1[i] + m_X128_Y128[i] - m_X1_Y128[i] - m_X128_Y1[i]);
MMv = MMv.unit();
- G4ThreeVector MMscal = MMu.dot(MMv);
+ double MMscal = MMu.dot(MMv);
MMw = MMu.cross(MMv);
// if (MMw.z() > 0) MMw = MMv.cross(MMu) ;
diff --git a/NPSimulation/src/ShieldPhParis.cc b/NPSimulation/src/ShieldPhParis.cc
index 0f6b140dc..4602661b6 100644
--- a/NPSimulation/src/ShieldPhParis.cc
+++ b/NPSimulation/src/ShieldPhParis.cc
@@ -473,7 +473,7 @@ void ShieldPhParis::ConstructDetector(G4LogicalVolume* world)
//MMv = -0.5 * (m_X1_Y1[i] + m_X128_Y128[i] - m_X1_Y128[i] - m_X128_Y1[i]);
MMv = MMv.unit();
- G4ThreeVector MMscal = MMu.dot(MMv);
+ double MMscal = MMu.dot(MMv);
MMw = MMu.cross(MMv);
// if (MMw.z() > 0) MMw = MMv.cross(MMu) ;
diff --git a/NPSimulation/vis.mac b/NPSimulation/vis.mac
index a5d707fb4..77c180a65 100644
--- a/NPSimulation/vis.mac
+++ b/NPSimulation/vis.mac
@@ -7,20 +7,21 @@
/run/verbose 0
# choose a graphic system
-##/vis/open OGLIX
-##/vis/open OGLSX
+/vis/open OGLIX
+#/vis/open OGLSX
+#/vis/open OGLIQt
#/vis/open VRML2FILE
-#/vis/scene/create
-#/vis/drawVolume
-#/vis/viewer/set/viewpointThetaPhi 0 0 deg
+/vis/scene/create
+/vis/drawVolume
+/vis/viewer/set/viewpointThetaPhi 90 30 deg
#/vis/viewer/zoom 7
## options to draw trajectories
-#/vis/scene/endOfEventAction accumulate
-#/vis/scene/add/trajectories 1
-#/tracking/storeTrajectory 1
-#/vis/scene/add/axes 0 0 0 20 cm
-#/vis/viewer/refresh
+/vis/scene/endOfEventAction accumulate
+/vis/scene/add/trajectories 1
+/tracking/storeTrajectory 1
+/vis/scene/add/axes 0 0 0 20 cm
+/vis/viewer/refresh
# run event
#/run/beamOn 0
--
GitLab