diff --git a/NPSimulation/src/GaspardTrackerDummyShape.cc b/NPSimulation/src/GaspardTrackerDummyShape.cc index 1867e685e4793e3754e509def0597614f2514212..d480e068579d718dd8dd6b9c61b0b47124d7c25b 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 71e021a8e7654bc974534bc8036ef05129d243cb..f1fc8fa1e8411d2c2dd8cfba1c0de01296ff885c 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 1a501934aee355b17b4a2ea32127491e28cef858..88b4076108a3f744fea8f256835ff2586a8fa156 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 464b611fe9489e03c7f70e49c1b6ed76d9a8da9c..4d3e464d7c7fcd356de343d655a3dc4b14ffaaec 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 cd7a6a4f4342f650dab49819f8af4c21ee3ff4ab..606fd11b99f89cccb5e0fb0bc30a7839c68107b1 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 2b77daa1872f600c4d441b9d0551885fcc843bc7..ed080a52392d3e716581fc2b6d900bf8e1e9ad67 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 0f6b140dcf54dbd26f18d4ed95396aea0ea61cc1..4602661b65a4f2a491c324c8a38a687226da3ad3 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 a5d707fb4bdc1aa0e81ebe7c24fcf0af0c750fda..77c180a655c5564fdc8c01ffe388ad82447503be 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