From 50c16995c910c815b47dc54fd5aac87fe47e1dfb Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Mon, 19 Oct 2020 09:02:31 +0000
Subject: [PATCH] Changes to SensitiveDetector unit tests to allow a vector of
physical volumes to be used when constructing the G4TouchableHistory instance
---
.../test/AFP_SensitiveDetector_gtest.cxx | 14 ++--
.../test/AFP_SiDSensitiveDetector_gtest.cxx | 8 +-
.../test/AFP_TDSensitiveDetector_gtest.cxx | 8 +-
.../test/ALFA_SensitiveDetector_gtest.cxx | 20 ++---
.../test/LUCID_SensitiveDetector_gtest.cxx | 8 +-
.../ZDC/ZDC_SD/test/ZDC_PixelSD_gtest.cxx | 8 +-
.../ZDC/ZDC_SD/test/ZDC_StripSD_gtest.cxx | 8 +-
.../BCM_G4_SD/test/BCMSensorSD_gtest.cxx | 8 +-
.../BLM_G4_SD/test/BLMSensorSD_gtest.cxx | 8 +-
.../PixelG4_SD/test/PixelSensorSD_gtest.cxx | 8 +-
.../SCT_G4_SD/test/SctSensorSD_gtest.cxx | 8 +-
.../SCT_G4_SD/test/SctSensor_CTB_gtest.cxx | 8 +-
.../test/TRTSensitiveDetector_gtest.cxx | 8 +-
.../CSCSensitiveDetectorCosmics_gtest.cxx | 22 +++---
.../test/CSCSensitiveDetector_gtest.cxx | 10 ++-
.../GenericMuonSensitiveDetector_gtest.cxx | 8 +-
.../MDTSensitiveDetectorCosmics_gtest.cxx | 70 +++++++++++++-----
.../test/MDTSensitiveDetector_gtest.cxx | 74 +++++++++++++------
.../MicromegasSensitiveDetector_gtest.cxx | 12 +--
.../RPCSensitiveDetectorCosmics_gtest.cxx | 14 ++--
.../test/RPCSensitiveDetector_gtest.cxx | 14 ++--
.../TGCSensitiveDetectorCosmics_gtest.cxx | 10 ++-
.../test/TGCSensitiveDetector_gtest.cxx | 12 +--
.../test/sTGCSensitiveDetector_gtest.cxx | 45 +++++++----
.../DerivedG4SensitiveDetectorTestSetting.h | 48 ++++++++----
25 files changed, 299 insertions(+), 162 deletions(-)
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SensitiveDetector_gtest.cxx b/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SensitiveDetector_gtest.cxx
index 9aa45a9fc90..b9da97be398 100644
--- a/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SensitiveDetector_gtest.cxx
+++ b/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -60,9 +62,9 @@ TEST_F( AFP_SensitiveDetectortest, Initialize )
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "physicsTDQuarticBar[9]";
+ std::vector<G4String> physicalname = {"physicsTDQuarticBar[9]"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -82,7 +84,7 @@ TEST_F( AFP_SensitiveDetectortest, Initialize )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
AFP_SensitiveDetector sd21("name21", "name21", "name21");
sd21.Initialize(&hce);
@@ -130,9 +132,9 @@ TEST_F( AFP_SensitiveDetectortest, ProcessHits2 )//this test aims to test the sp
G4TouchableHistory th;
G4double totalenergydeposit = 8;
- G4String physicalname = "phy01lSIDSensor[9]";
+ std::vector<G4String> physicalname = {"phy01lSIDSensor[9]"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(1,1,1);
G4ThreeVector postStepPos = G4ThreeVector(2,2,2);
G4double globaltime0 = 0.5;
@@ -152,7 +154,7 @@ TEST_F( AFP_SensitiveDetectortest, ProcessHits2 )//this test aims to test the sp
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
AFP_SensitiveDetector sd22("name22", "name22", "name22");
sd22.Initialize(&hce);
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SiDSensitiveDetector_gtest.cxx b/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SiDSensitiveDetector_gtest.cxx
index 27fecc9682b..a6219130e37 100644
--- a/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SiDSensitiveDetector_gtest.cxx
+++ b/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_SiDSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -59,9 +61,9 @@ TEST_F( AFP_SiDSensitiveDetectortest, ProcessHits )
G4TouchableHistory th;
G4double totalenergydeposit = 8;
- G4String physicalname = "phy01csSIDSensor[9]";
+ std::vector<G4String> physicalname = {"phy01csSIDSensor[9]"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(2,2,2);
G4double globaltime0 = 0.5;
@@ -81,7 +83,7 @@ TEST_F( AFP_SiDSensitiveDetectortest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
AFP_SiDSensitiveDetector sd2( "name2", "name2" );
sd2.Initialize(&hce);
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_TDSensitiveDetector_gtest.cxx b/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_TDSensitiveDetector_gtest.cxx
index 883db1c1a06..3e6f79f4591 100644
--- a/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_TDSensitiveDetector_gtest.cxx
+++ b/ForwardDetectors/AFP/AFP_G4_SD/test/AFP_TDSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -59,9 +61,9 @@ TEST_F( AFP_TDSensitiveDetectortest, ProcessHits )
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "phy01csTDQuarticBar[9]";
+ std::vector<G4String> physicalname = {"phy01csTDQuarticBar[9]"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -81,7 +83,7 @@ TEST_F( AFP_TDSensitiveDetectortest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
AFP_TDSensitiveDetector sd2("name2", "name2");
sd2.Initialize(&hce);
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/test/ALFA_SensitiveDetector_gtest.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/test/ALFA_SensitiveDetector_gtest.cxx
index 402e487b5d9..345b3972dd8 100644
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/test/ALFA_SensitiveDetector_gtest.cxx
+++ b/ForwardDetectors/ALFA/ALFA_G4_SD/test/ALFA_SensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -59,9 +61,9 @@ TEST_F( ALFA_SensitiveDetectortest, ProcessHits1 )//test first block of ProcessH
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "GVSB7R1";
+ std::vector<G4String> physicalname = {"GVSB7R1"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -81,7 +83,7 @@ TEST_F( ALFA_SensitiveDetectortest, ProcessHits1 )//test first block of ProcessH
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
ALFA_SensitiveDetector sd21( "name21", "name21", "name21" );
sd21.Initialize(&hce);
@@ -113,9 +115,9 @@ TEST_F( ALFA_SensitiveDetectortest, ProcessHits1 )//test first block of ProcessH
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "ALFA_FiBBBUB[3] [2] [1]";
+ std::vector<G4String> physicalname = {"ALFA_FiBBBUB[3] [2] [1]";}
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -135,7 +137,7 @@ TEST_F( ALFA_SensitiveDetectortest, ProcessHits1 )//test first block of ProcessH
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
ALFA_SensitiveDetector sd22( "name22", "name22", "name22" );
sd22.Initialize(&hce);
@@ -168,9 +170,9 @@ TEST_F( ALFA_SensitiveDetectortest, ProcessHits1 )//test first block of ProcessH
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "ODFiberU1[3][2][1]";
+ std::vector<G4String> physicalname = {"ODFiberU1[3][2][1]"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -190,7 +192,7 @@ TEST_F( ALFA_SensitiveDetectortest, ProcessHits1 )//test first block of ProcessH
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
ALFA_SensitiveDetector sd23( "name23", "name23", "name23" );
sd23.Initialize(&hce);
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/test/LUCID_SensitiveDetector_gtest.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/test/LUCID_SensitiveDetector_gtest.cxx
index 669b5cacf5f..5867d994e04 100644
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/test/LUCID_SensitiveDetector_gtest.cxx
+++ b/ForwardDetectors/LUCID/LUCID_G4_SD/test/LUCID_SensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -58,9 +60,9 @@ TEST_F( LUCID_SensitiveDetectortest, ProcessHits )
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "BBBBBTubeGas50";
+ std::vector<G4String> physicalname = {"BBBBBTubeGas50"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -80,7 +82,7 @@ TEST_F( LUCID_SensitiveDetectortest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
LUCID_SensitiveDetector sd2( "name2", "name2" );
sd2.Initialize(&hce);
diff --git a/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_PixelSD_gtest.cxx b/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_PixelSD_gtest.cxx
index 491e1c166ba..0371e653f62 100644
--- a/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_PixelSD_gtest.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_PixelSD_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -58,9 +60,9 @@ TEST_F( ZDC_PixelSDtest, ProcessHits )
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "physicsTDQuarticBar[9]";
+ std::vector<G4String> physicalname = {"physicsTDQuarticBar[9]"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 21978;
+ std::vector<G4int> copynos = {21978};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -80,7 +82,7 @@ TEST_F( ZDC_PixelSDtest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
ZDC_PixelSD sd2("name2", "name2");
sd2.Initialize(&hce);
diff --git a/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_StripSD_gtest.cxx b/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_StripSD_gtest.cxx
index fe1ccad05a2..c9772f74b95 100644
--- a/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_StripSD_gtest.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SD/test/ZDC_StripSD_gtest.cxx
@@ -5,6 +5,8 @@
#include "src/ZDC_StripSD.h"
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -58,9 +60,9 @@ TEST_F( ZDC_StripSDtest, ProcessHits )
G4TouchableHistory th;
G4double totalenergydeposit = 0.8;
- G4String physicalname = "physicsTDQuarticBar[9]";
+ std::vector<G4String> physicalname = {"physicsTDQuarticBar[9]"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 11000;
+ std::vector<G4int> copynos = {11000};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -80,7 +82,7 @@ TEST_F( ZDC_StripSDtest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
ZDC_StripSD sd2("name2", "name2");
sd2.Initialize(&hce);
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/test/BCMSensorSD_gtest.cxx b/InnerDetector/InDetG4/BCM_G4_SD/test/BCMSensorSD_gtest.cxx
index ce89939cea3..aa4ddfbfe38 100644
--- a/InnerDetector/InDetG4/BCM_G4_SD/test/BCMSensorSD_gtest.cxx
+++ b/InnerDetector/InDetG4/BCM_G4_SD/test/BCMSensorSD_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -58,9 +60,9 @@ TEST_F( BCMSensorSDtest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"physicalName"};
G4String logicalname = "Pixel::bcmDiamondLog";
- G4int copyno = 11950;
+ std::vector<G4int> copynos = {11950};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -80,7 +82,7 @@ TEST_F( BCMSensorSDtest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
BCMSensorSD sd2("name2", "name2");
sd2.Initialize( &hce );
diff --git a/InnerDetector/InDetG4/BLM_G4_SD/test/BLMSensorSD_gtest.cxx b/InnerDetector/InDetG4/BLM_G4_SD/test/BLMSensorSD_gtest.cxx
index 3ea9496eee4..be7a8e09bc0 100644
--- a/InnerDetector/InDetG4/BLM_G4_SD/test/BLMSensorSD_gtest.cxx
+++ b/InnerDetector/InDetG4/BLM_G4_SD/test/BLMSensorSD_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -63,9 +65,9 @@ TEST_F( BLMSensorSDtest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"physicalName"};
G4String logicalname = "Pixel::blmDiamondLog";
- G4int copyno = 2009;
+ std::vector<G4int> copynos = {2009};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -85,7 +87,7 @@ TEST_F( BLMSensorSDtest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
BLMSensorSD sd2("name2", "name2");
sd2.Initialize( &hce );
diff --git a/InnerDetector/InDetG4/PixelG4_SD/test/PixelSensorSD_gtest.cxx b/InnerDetector/InDetG4/PixelG4_SD/test/PixelSensorSD_gtest.cxx
index c5adf70ce8f..587fae5bf81 100644
--- a/InnerDetector/InDetG4/PixelG4_SD/test/PixelSensorSD_gtest.cxx
+++ b/InnerDetector/InDetG4/PixelG4_SD/test/PixelSensorSD_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -58,9 +60,9 @@ TEST_F( PixelSensorSDtest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "10_20_30_40_50_";
+ std::vector<G4String> physicalname = {"10_20_30_40_50_"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 500;
+ std::vector<G4int> copynos = {500};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -80,7 +82,7 @@ TEST_F( PixelSensorSDtest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
PixelSensorSD sd2("name2", "name2");
sd2.Initialize( &hce );
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensorSD_gtest.cxx b/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensorSD_gtest.cxx
index b058ab89fc4..8b458930227 100644
--- a/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensorSD_gtest.cxx
+++ b/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensorSD_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -57,9 +59,9 @@ TEST_F( SctSensorSDtest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"physicalName"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 1000;
+ std::vector<G4int> copynos = {1000};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -79,7 +81,7 @@ TEST_F( SctSensorSDtest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
SctSensorSD sd2("name2", "name2");
sd2.Initialize( &hce );
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensor_CTB_gtest.cxx b/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensor_CTB_gtest.cxx
index 89f79af05e1..7dfe6387285 100644
--- a/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensor_CTB_gtest.cxx
+++ b/InnerDetector/InDetG4/SCT_G4_SD/test/SctSensor_CTB_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -58,9 +60,9 @@ TEST_F( SctSensor_CTBtest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"physicalName"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 1000;
+ std::vector<G4int> copynos = {1000};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -80,7 +82,7 @@ TEST_F( SctSensor_CTBtest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
SctSensor_CTB sd2("name2", "name2");
sd2.Initialize( &hce );
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/test/TRTSensitiveDetector_gtest.cxx b/InnerDetector/InDetG4/TRT_G4_SD/test/TRTSensitiveDetector_gtest.cxx
index aaed580ea6b..3fcbd98db69 100644
--- a/InnerDetector/InDetG4/TRT_G4_SD/test/TRTSensitiveDetector_gtest.cxx
+++ b/InnerDetector/InDetG4/TRT_G4_SD/test/TRTSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -107,9 +109,9 @@ TEST_F( TRTSensitiveDetectortest, ProcessHits )
G4TouchableHistory th;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"physicalName"};
G4String logicalname = "whatever";
- G4int copyno = 1000;
+ std::vector<G4int> copynos = {1000};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -129,7 +131,7 @@ TEST_F( TRTSensitiveDetectortest, ProcessHits )
G4String nop1 = "anyon";
G4String nop2 = "anyon";
G4String nop3 = "anyon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
TRTSensitiveDetector sd2("sd2", "sd2", 5);
sd2.Initialize(&hce);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetectorCosmics_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetectorCosmics_gtest.cxx
index 41da0111761..510c1fe3860 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetectorCosmics_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetectorCosmics_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -45,12 +47,12 @@ TEST_F ( CSCSensitiveDetectorCosmicstest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_CSC_Muon::STN[2]_av___impr_Name";//set a proper name for the physical volume, which will decide which block of the tested class would be executed(i.e. block "else if ((npos = volName.find("CSC")) != std::string::npos && isAssembly )")
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","av_102_impr_1_Muon::CSL2CSC02_pv_1_cl[2]CSC02component","Muon::CscMultilayer","CscArCO2"};//set a proper name for the physical volume, which will decide which block of the tested class would be executed(i.e. block "else if ((npos = volName.find("CSC")) != std::string::npos && isAssembly )")
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 10100000;
+ std::vector<G4int> copynos = {0,0,0,0,1110600003,16969,0};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -70,7 +72,7 @@ TEST_F ( CSCSensitiveDetectorCosmicstest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment. Here set the TrackID as 3, so the statements "if ((m_currVertex != m_vertex) && (aStep->GetTrack()->GetTrackID() == 1))" will not be satisfied and executed.
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment. Here set the TrackID as 3, so the statements "if ((m_currVertex != m_vertex) && (aStep->GetTrack()->GetTrackID() == 1))" will not be satisfied and executed.
CSCSensitiveDetectorCosmics sd2("name2", "name2" );
sd2.Initialize( &hce );//initialize the hit collection m_myCSCHitColl
@@ -80,12 +82,12 @@ TEST_F ( CSCSensitiveDetectorCosmicstest, ProcessHits )
HepMcParticleLink plink(barcode);
CSCSimHitCollection* a = sd2.m_myCSCHitColl.ptr();
- ASSERT_EQ(a->begin()->CSCid(), -16384);//test if the CSCid value of the Hit generated by this member function is right, the same below
- ASSERT_EQ(a->begin()->globalTime(), -1);
- ASSERT_EQ(a->begin()->energyDeposit(), -1);
- ASSERT_EQ(a->begin()->getHitStart(), Amg::Vector3D(-1000,-1000,-1000));
- ASSERT_EQ(a->begin()->getHitEnd(), Amg::Vector3D(-1000,-1000,-1000));
- ASSERT_EQ(a->begin()->particleID(), -1);
+ ASSERT_EQ(a->begin()->CSCid(), 234691);//test if the CSCid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->globalTime(), 0.5);
+ ASSERT_EQ(a->begin()->energyDeposit(), 3);
+ ASSERT_EQ(a->begin()->getHitStart(), Amg::Vector3D(0,0,1));
+ ASSERT_EQ(a->begin()->getHitEnd(), Amg::Vector3D(0,0,2));
+ ASSERT_EQ(a->begin()->particleID(), 1);
ASSERT_EQ(a->begin()->particleLink(), plink);
ASSERT_EQ(a->begin()->kineticEnergy(), 1.5);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetector_gtest.cxx
index 7a76b801b9f..c0ef598449e 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/CSCSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -57,9 +59,9 @@ TEST_F ( CSCSensitiveDetectortest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_CscArCO2_av___impr_Name";//set a proper name for the physical volume, which will decide which block of the tested class would be executed(i.e. block "else if ((npos = volName.find("CscArCO2")) != std::string::npos)")
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","av_102_impr_1_Muon::CSL2CSC02_pv_1_cl[2]CSC02component","Muon::CscMultilayer","CscArCO2"};//set a proper name for the physical volume, which will decide which block of the tested class would be executed(i.e. block "else if ((npos = volName.find("CSC")) != std::string::npos && isAssembly )")
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 1;
+ std::vector<G4int> copynos = {0,0,0,0,1110600003,16969,0};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -79,7 +81,7 @@ TEST_F ( CSCSensitiveDetectortest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment
CSCSensitiveDetector sd2("name2", "name2" );
sd2.Initialize( &hce );
@@ -94,7 +96,7 @@ TEST_F ( CSCSensitiveDetectortest, ProcessHits )
ASSERT_EQ(a->begin()->getHitStart(), Amg::Vector3D(0,0,1));
ASSERT_EQ(a->begin()->getHitEnd(), Amg::Vector3D(0,0,2));
ASSERT_EQ(a->begin()->particleID(), 1);
- ASSERT_EQ(a->begin()->CSCid(), 147456);
+ ASSERT_EQ(a->begin()->CSCid(), 234691);
ASSERT_EQ(a->begin()->kineticEnergy(), 1.5);
ASSERT_EQ(a->begin()->particleLink(), plink);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/GenericMuonSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/GenericMuonSensitiveDetector_gtest.cxx
index 8181681df97..8651e71c416 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/GenericMuonSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/GenericMuonSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -48,9 +50,9 @@ TEST_F ( GenericMuonSensitiveDetectortest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"physicalName"};
G4String logicalname = "logicalName";
- G4int copyno = 1000;
+ std::vector<G4int> copynos = {1000};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -70,7 +72,7 @@ TEST_F ( GenericMuonSensitiveDetectortest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
GenericMuonSensitiveDetector sd2("name2", "name2");
sd2.Initialize( &hce );
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx
index 42c16521e12..c756e3bdf4f 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -58,12 +60,12 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","BML2_station","ml[1]MDT03component","DriftTube8","SensitiveGas"};
G4String logicalname = "logicalName";
- G4int copyno = 1000;
+ std::vector<G4int> copynos = {0,0,0,0,302,8,109,16969};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -83,7 +85,7 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
//the following lines aims to set a G4StepPoint object for sp as a PreStepPoint since the setting for that in the function DerivedG4SensitiveDetectorTestSetting is not complete
G4StepPoint* stepPoint0 = new G4StepPoint();
@@ -97,18 +99,32 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, ProcessHits )
G4LogicalVolume* fLogical0 = new G4LogicalVolume(box0, material0, name0);
G4MySensitiveDetector* SDetector = new G4MySensitiveDetector("SensitiveDetectorName");
fLogical0->SetSensitiveDetector(SDetector);
- G4String PhysicalName0 = physicalname;//para
+ G4String PhysicalName0 = physicalname[0];//para
G4VPhysicalVolume* pPhysical0 = nullptr;
G4MyPhysicalVolume* physicalVolume0 = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), PhysicalName0, fLogical0, pPhysical0);
- G4int CopyNo0 = copyno;
+ G4int CopyNo0 = copynos[0];
physicalVolume0->SetCopyNo(CopyNo0);//para
G4int nReplica0 = 2;
navigationHistory0->SetFirstEntry(physicalVolume0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ if (physicalname.size()==1) {
+ // temporary workaround
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ }
+ else {
+ bool skip(true);
+ size_t idx(0);
+ for( const auto& name : physicalname) {
+ if (skip) { skip=false; ++idx; continue; }//skip first entry
+ G4MyPhysicalVolume* parentPhysVol = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), name, fLogical0, pPhysical0);
+ parentPhysVol->SetCopyNo(copynos[idx]);
+ ++idx;
+ navigationHistory0->NewLevel(parentPhysVol, kNormal, nReplica0);
+ }
+ }
G4TouchableHistory* touchableHistory0 = new G4TouchableHistory(*navigationHistory0);
G4TouchableHandle touchableHandle0(touchableHistory0);
stepPoint0->SetTouchableHandle(touchableHandle0);
@@ -133,18 +149,32 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, ProcessHits )
G4Material* material = man->FindOrBuildMaterial("G4_AIR");
G4String name = "logicalName";
G4LogicalVolume* fLogical = new G4LogicalVolume(box, material, name);
- G4String PhysicalName = physicalname;//para
+ G4String PhysicalName = physicalname[0];//para
G4VPhysicalVolume* pPhysical = nullptr;
G4MyPhysicalVolume* physicalVolume = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), PhysicalName, fLogical, pPhysical);
- G4int CopyNo = copyno;
+ G4int CopyNo = copynos[0];
physicalVolume->SetCopyNo(CopyNo);//para
G4int nReplica = 2;
navigationHistory->SetFirstEntry(physicalVolume);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ if (physicalname.size()==1) {
+ // temporary workaround
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ }
+ else {
+ bool skip(true);
+ size_t idx(0);
+ for( const auto& name : physicalname) {
+ if (skip) { skip=false; ++idx; continue; }//skip first entry
+ G4MyPhysicalVolume* parentPhysVol = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), name, fLogical0, pPhysical0);
+ parentPhysVol->SetCopyNo(copynos[idx]);
+ ++idx;
+ navigationHistory->NewLevel(parentPhysVol, kNormal, nReplica);
+ }
+ }
G4TouchableHistory* touchableHistory = new G4TouchableHistory(*navigationHistory);
G4TouchableHandle touchableHandle(touchableHistory);
stepPoint->SetTouchableHandle(touchableHandle);
@@ -216,7 +246,7 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, ProcessHits )
HepMcParticleLink plink(barcode);
MDTSimHitCollection* a = sd2.m_MDTHitColl.ptr();
- ASSERT_EQ(a->begin()->MDTid(), -189440); //test if the MDTid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->MDTid(), 16868488); //test if the MDTid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->driftRadius(), 0);
ASSERT_EQ(a->begin()->localPosition(), Amg::Vector3D(0,0,1));
@@ -231,7 +261,7 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, ProcessHits )
TEST_F ( MDTSensitiveDetectorCosmicstest, GetIdentifier )
{
//define a G4HCofThisEvent object
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
//the following line aims to define a complete G4TouchableHistory object
G4NavigationHistory* navigationHistory = new G4NavigationHistory();
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx
index 453fe6805ff..5eefec3202a 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -59,12 +61,12 @@ TEST_F ( MDTSensitiveDetectortest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physicalName";
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","EES4_station","ml[2]MDT04component","DriftTube57","SensitiveGas"};
G4String logicalname = "logicalName";
- G4int copyno = 1000;
+ std::vector<G4int> copynos = {0,0,0,0,-1207,7,218,16969};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -84,7 +86,7 @@ TEST_F ( MDTSensitiveDetectortest, ProcessHits )
G4String nop1 = "opticalphoton";
G4String nop2 = "opticalphoton";
G4String nop3 = "photon";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);
//the following lines aims to set a G4StepPoint object for sp as a PreStepPoint since the setting for that in the function DerivedG4SensitiveDetectorTestSetting is not complete
G4StepPoint* stepPoint0 = new G4StepPoint();
@@ -98,18 +100,32 @@ TEST_F ( MDTSensitiveDetectortest, ProcessHits )
G4LogicalVolume* fLogical0 = new G4LogicalVolume(box0, material0, name0);
G4MySensitiveDetector* SDetector = new G4MySensitiveDetector("SensitiveDetectorName");
fLogical0->SetSensitiveDetector(SDetector);
- G4String PhysicalName0 = physicalname;//para
+ G4String PhysicalName0 = physicalname[0];//para
G4VPhysicalVolume* pPhysical0 = nullptr;
G4MyPhysicalVolume* physicalVolume0 = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), PhysicalName0, fLogical0, pPhysical0);
- G4int CopyNo0 = copyno;
+ G4int CopyNo0 = copynos[0];
physicalVolume0->SetCopyNo(CopyNo0);//para
G4int nReplica0 = 2;
navigationHistory0->SetFirstEntry(physicalVolume0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ if (physicalname.size()==1) {
+ // temporary workaround
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ }
+ else {
+ bool skip(true);
+ size_t idx(0);
+ for( const auto& name : physicalname) {
+ if (skip) { skip=false; ++idx; continue; }//skip first entry
+ G4MyPhysicalVolume* parentPhysVol = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), name, fLogical0, pPhysical0);
+ parentPhysVol->SetCopyNo(copynos[idx]);
+ ++idx;
+ navigationHistory0->NewLevel(parentPhysVol, kNormal, nReplica0);
+ }
+ }
G4TouchableHistory* touchableHistory0 = new G4TouchableHistory(*navigationHistory0);
G4TouchableHandle touchableHandle0(touchableHistory0);
stepPoint0->SetTouchableHandle(touchableHandle0);
@@ -134,18 +150,32 @@ TEST_F ( MDTSensitiveDetectortest, ProcessHits )
G4Material* material = man->FindOrBuildMaterial("G4_AIR");
G4String name = "logicalName";
G4LogicalVolume* fLogical = new G4LogicalVolume(box, material, name);
- G4String PhysicalName = physicalname;//para
+ G4String PhysicalName = physicalname[0];//para
G4VPhysicalVolume* pPhysical = nullptr;
G4MyPhysicalVolume* physicalVolume = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), PhysicalName, fLogical, pPhysical);
- G4int CopyNo = copyno;
+ G4int CopyNo = copynos[0];
physicalVolume->SetCopyNo(CopyNo);//para
G4int nReplica = 2;
navigationHistory->SetFirstEntry(physicalVolume);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ if (physicalname.size()==1) {
+ // temporary workaround
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ }
+ else {
+ bool skip(true);
+ size_t idx(0);
+ for( const auto& name : physicalname) {
+ if (skip) { skip=false; ++idx; continue; }//skip first entry
+ G4MyPhysicalVolume* parentPhysVol = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), name, fLogical0, pPhysical0);
+ parentPhysVol->SetCopyNo(copynos[idx]);
+ ++idx;
+ navigationHistory->NewLevel(parentPhysVol, kNormal, nReplica);
+ }
+ }
G4TouchableHistory* touchableHistory = new G4TouchableHistory(*navigationHistory);
G4TouchableHandle touchableHandle(touchableHistory);
stepPoint->SetTouchableHandle(touchableHandle);
@@ -216,7 +246,7 @@ TEST_F ( MDTSensitiveDetectortest, ProcessHits )
HepMcParticleLink plink(barcode);
MDTSimHitCollection* a = sd2.m_MDTHitColl.ptr();
- ASSERT_EQ(a->begin()->MDTid(), 73728); //test if the MDTid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->MDTid(), 36493337); //test if the MDTid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->driftRadius(), 0);
ASSERT_EQ(a->begin()->localPosition(), Amg::Vector3D(0,0,1));
@@ -231,7 +261,7 @@ TEST_F ( MDTSensitiveDetectortest, ProcessHits )
TEST_F ( MDTSensitiveDetectortest, GetIdentifier )
{
//define a G4HCofThisEvent object
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
//the following line aims to define a complete G4TouchableHistory object
G4NavigationHistory* navigationHistory = new G4NavigationHistory();
@@ -241,9 +271,9 @@ TEST_F ( MDTSensitiveDetectortest, GetIdentifier )
G4Material* material = man->FindOrBuildMaterial("G4_AIR");
G4String name = "logicalName";
G4LogicalVolume* fLogical = new G4LogicalVolume(box, material, name);
- G4String PhysicalName = "physical_MDT_Muon::STN[2]_av___impr_Name";
+ std::vector<G4String> physicalname = {"physical_MDT_Muon::STN[2]_av___impr_Name"};
G4VPhysicalVolume* pPhysical = nullptr;
- G4MyPhysicalVolume* physicalVolume = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), PhysicalName, fLogical, pPhysical);
+ G4MyPhysicalVolume* physicalVolume = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), physicalname[0], fLogical, pPhysical);
physicalVolume->SetCopyNo(10100000);
G4int nReplica = 2;
navigationHistory->SetFirstEntry(physicalVolume);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/MicromegasSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/MicromegasSensitiveDetector_gtest.cxx
index e67f0723176..ad504a9bca2 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/MicromegasSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/MicromegasSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -45,12 +47,12 @@ TEST_F( MicromegasSensitiveDetectortest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_CscArCO2_av___impr_Name";
+ std::vector<G4String> physicalname = {"x","Muon::MM_1-M1S2"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 1;
+ std::vector<G4int> copynos = {1,150};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -70,7 +72,7 @@ TEST_F( MicromegasSensitiveDetectortest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment
//set G4Track for the step since it was not done in the previous function
G4double Charge = charge;
@@ -121,7 +123,7 @@ TEST_F( MicromegasSensitiveDetectortest, ProcessHits )
HepMcParticleLink plink(barcode);
MMSimHitCollection* a = sd2.m_MMSimHitCollection.ptr();
- ASSERT_EQ(a->begin()->MMId(), -462592);//test if the MMId alue of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->MMId(), -397056);//test if the MMId alue of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->globalPosition(), Amg::Vector3D(0,0,2));
ASSERT_EQ(a->begin()->particleEncoding(), 22);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetectorCosmics_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetectorCosmics_gtest.cxx
index 3be973eeadd..f56e7ad2ae1 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetectorCosmics_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetectorCosmics_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -45,12 +47,12 @@ TEST_F ( RPCSensitiveDetectorCosmicstest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_RPC_Muon::STN[2]_av___impr_Name";//set a proper name for the physical volume, which will decide which block of the tested class would be executed
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","BML2_station","SwapdbPdbRdbZ[-1101]RPC10rpccomponent","Muon::Rpclayer","Muon::gas volume:2gg_in_s_2sp_in_s","Muon::gazGap"};//set a proper name for the physical volume, which will decide which block of the tested class would be executed
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 10100000;
+ std::vector<G4int> copynos = {0,0,0,0,302,-1105,2,0,1};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -70,7 +72,7 @@ TEST_F ( RPCSensitiveDetectorCosmicstest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
RPCSensitiveDetectorCosmics sd2("name2", "name2", 2); // name, hitCollectionName, nGasGaps; all non-BIS RPCs (Run1+2) have 2 gas gaps, only BIS RPCs have 3 gas gaps
sd2.Initialize( &hce );//initialize the hit collection m_myCSCHitColl
@@ -82,7 +84,7 @@ TEST_F ( RPCSensitiveDetectorCosmicstest, ProcessHits )
RPCSimHitCollection* a = sd2.m_myRPCHitColl.ptr();
//test the first newly-generated hit that has been stored in the RPCSimHitCollection collector
- ASSERT_EQ(a->begin()->RPCid(), -8577024); //test if the RPCid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->RPCid(), 91272); //test if the RPCid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->preLocalPosition(), Amg::Vector3D(0,0,1));
ASSERT_EQ(a->begin()->particleLink(), plink);
@@ -93,7 +95,7 @@ TEST_F ( RPCSensitiveDetectorCosmicstest, ProcessHits )
ASSERT_EQ(a->begin()->kineticEnergy(), 1.5);
//test the second newly-generated hit that has been stored in the RPCSimHitCollection collector
- ASSERT_EQ(((a->begin())+1)->RPCid(), -188416); //test if the RPCid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(((a->begin())+1)->RPCid(), 8479880); //test if the RPCid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(((a->begin())+1)->globalTime(), 0.5);
ASSERT_EQ(((a->begin())+1)->preLocalPosition(), Amg::Vector3D(0,0,1));
ASSERT_EQ(((a->begin())+1)->particleLink(), plink);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetector_gtest.cxx
index a035f567e1f..d610d17e363 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/RPCSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -46,12 +48,12 @@ TEST_F ( RPCSensitiveDetectortest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_RPC_Muon::STN[2]_av___impr_Name";//set a proper name for the physical volume, which will decide which block of the tested class would be executed
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","BML2_station","SwapdbPdbRdbZ[-1101]RPC10rpccomponent","Muon::Rpclayer","Muon::gas volume:2gg_in_s_2sp_in_s","Muon::gazGap"};//set a proper name for the physical volume, which will decide which block of the tested class would be executed
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 10100000;
+ std::vector<G4int> copynos = {0,0,0,0,302,-1105,2,0,1};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -71,7 +73,7 @@ TEST_F ( RPCSensitiveDetectortest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
RPCSensitiveDetector sd2("name2", "name2", 2); // name, hitCollectionName, nGasGaps; all non-BIS RPCs (Run1+2) have 2 gas gaps, only BIS RPCs have 3 gas gaps
sd2.Initialize( &hce );//initialize the hit collection m_myRPCHitColl
@@ -83,7 +85,7 @@ TEST_F ( RPCSensitiveDetectortest, ProcessHits )
RPCSimHitCollection* a = sd2.m_myRPCHitColl.ptr();
//test the first newly-generated hit that has been stored in the RPCSimHitCollection collector
- ASSERT_EQ(a->begin()->RPCid(), -8577024); //test if the RPCid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->RPCid(), 91272); //test if the RPCid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->preLocalPosition(), Amg::Vector3D(0,0,1));
ASSERT_EQ(a->begin()->particleLink(), plink);
@@ -94,7 +96,7 @@ TEST_F ( RPCSensitiveDetectortest, ProcessHits )
ASSERT_EQ(a->begin()->kineticEnergy(), 1.5);
//test the second newly-generated hit that has been stored in the RPCSimHitCollection collector
- ASSERT_EQ(((a->begin())+1)->RPCid(), -188416); //test if the RPCid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(((a->begin())+1)->RPCid(), 8479880); //test if the RPCid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(((a->begin())+1)->globalTime(), 0.5);
ASSERT_EQ(((a->begin())+1)->preLocalPosition(), Amg::Vector3D(0,0,1));
ASSERT_EQ(((a->begin())+1)->particleLink(), plink);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetectorCosmics_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetectorCosmics_gtest.cxx
index 96d228b16fb..732b9a796f9 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetectorCosmics_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetectorCosmics_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -48,9 +50,9 @@ TEST_F( TGCSensitiveDetectorCosmicstest, ProcessHits )
G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_TGCGas_Muon::STN[2]_av___impr_Name";//set a proper name for the physical volume, which will decide which block of the tested class would be executed
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","T3F1_station","stPhiJob[15001]TGC12tgccomponent","TGC12muo::TGCGas"};//set a proper name for the physical volume, which will decide which block of the tested class would be executed
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 10100000;
+ std::vector<G4int> copynos = {0,0,0,0,406,15001,2};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -70,7 +72,7 @@ TEST_F( TGCSensitiveDetectorCosmicstest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
TGCSensitiveDetectorCosmics sd2("name2", "name2" );
sd2.Initialize( &hce );//initialize the hit collection m_myTGCHitColl
@@ -80,7 +82,7 @@ TEST_F( TGCSensitiveDetectorCosmicstest, ProcessHits )
HepMcParticleLink plink(barcode);
TGCSimHitCollection* a = sd2.m_myTGCHitColl.ptr();
- ASSERT_EQ(a->begin()->TGCid(), -656384); //test if the TGCid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->TGCid(), 1456690); //test if the TGCid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->localPosition(), Amg::Vector3D(0,0,1));
ASSERT_EQ(a->begin()->localDireCos(), Amg::Vector3D(0,0,0));
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetector_gtest.cxx
index 713ef1f229a..6a3ab7417dc 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/TGCSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -45,12 +47,12 @@ TEST_F ( TGCSensitiveDetectortest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_TGC_Muon::STN[2]_av___impr_Name";//set a proper name for the physical volume, which will decide which block of the tested class would be executed
+ std::vector<G4String> physicalname = {"World::World","Atlas::Atlas","MUONQ02::MUONQ02","Muon::MuonSys","T3F1_station","stPhiJob[15001]TGC12tgccomponent","TGC12muo::TGCGas"};//set a proper name for the physical volume, which will decide which block of the tested class would be executed
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 10100000;
+ std::vector<G4int> copynos = {0,0,0,0,406,15001,2};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -70,7 +72,7 @@ TEST_F ( TGCSensitiveDetectortest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
TGCSensitiveDetector sd2("name2", "name2" );
sd2.Initialize( &hce );//initialize the hit collection m_myTGCHitColl
@@ -80,7 +82,7 @@ TEST_F ( TGCSensitiveDetectortest, ProcessHits )
HepMcParticleLink plink(barcode);
TGCSimHitCollection* a = sd2.m_myTGCHitColl.ptr();
- ASSERT_EQ(a->begin()->TGCid(), -525312); //test if the TGCid value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->TGCid(), 1456690); //test if the TGCid value of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->localPosition(), Amg::Vector3D(0,0,1));
ASSERT_EQ(a->begin()->localDireCos(), Amg::Vector3D(0,0,0));
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/sTGCSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/sTGCSensitiveDetector_gtest.cxx
index 7feb4318bfa..3d60c75c60a 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/sTGCSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/sTGCSensitiveDetector_gtest.cxx
@@ -6,6 +6,8 @@
#include "gtest/gtest.h"
+#include <vector>
+
#include "TestTools/initGaudi.h"
#include "G4HCofThisEvent.hh"
@@ -45,12 +47,12 @@ TEST_F ( sTGCSensitiveDetectortest, ProcessHits )
{
G4Step sp;
G4TouchableHistory th;
- G4HCofThisEvent hce;
+ G4HCofThisEvent hce;
G4double totalenergydeposit = 3.0;
- G4String physicalname = "physical_TGC_Muon::STN[2]-Name";//set a proper name for the physical volume, which will decide which block of the tested class would be executed
+ std::vector<G4String> physicalname = {"x","Muon::sTGC_1-QS2P"};
G4String logicalname = "BBBBBBBBBTubeGas";
- G4int copyno = 10100000;
+ std::vector<G4int> copynos = {1,11815};
G4ThreeVector preStepPos = G4ThreeVector(0,0,1);
G4ThreeVector postStepPos = G4ThreeVector(0,0,2);
G4double globaltime0 = 0.5;
@@ -70,7 +72,7 @@ TEST_F ( sTGCSensitiveDetectortest, ProcessHits )
G4String nop1 = "gamma";//set particle name as gamma
G4String nop2 = "gamma";
G4String nop3 = "gamma";
- DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copyno, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
+ DerivedG4SensitiveDetectorTestSetting(sp, totalenergydeposit, physicalname, logicalname, copynos, preStepPos, postStepPos, globaltime0, kineticenergy0, velocity0, globaltime, kineticenergy, globaltime1, kineticenergy1, velocity1, steplength, charge, encoding, antiencoding, astring, atype, nop1, nop2, nop3);//invoking of this function aims to setting testing environment.
//the following lines aims to set a G4StepPoint object for sp as a PreStepPoint since the setting for that in the function DerivedG4SensitiveDetectorTestSetting is not complete
G4StepPoint* stepPoint0 = new G4StepPoint();
@@ -82,18 +84,35 @@ TEST_F ( sTGCSensitiveDetectortest, ProcessHits )
G4Material* material0 = man->FindOrBuildMaterial("G4_AIR");
G4String name0 = "logical-TLNPame";
G4LogicalVolume* fLogical0 = new G4LogicalVolume(box0, material0, name0);
- G4String PhysicalName0 = physicalname;//para
+ G4String PhysicalName0 = physicalname[0];//para
G4VPhysicalVolume* pPhysical0 = nullptr;
G4MyPhysicalVolume* physicalVolume0 = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), PhysicalName0, fLogical0, pPhysical0);
- G4int CopyNo0 = copyno;
+ G4int CopyNo0 = copynos[0];
physicalVolume0->SetCopyNo(CopyNo0);//para
- G4int nReplica0 = 2;
+ G4int nReplica = 2;
navigationHistory0->SetFirstEntry(physicalVolume0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
- navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica0);
+ if (physicalname.size()==1) {
+ // temporary workaround
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica);
+ navigationHistory0->NewLevel(physicalVolume0, kNormal, nReplica);
+ }
+ else {
+ if(copynos.size()<physicalname.size()) {
+ copynos.resize(physicalname.size());
+ }
+ bool skip(true);
+ size_t idx(0);
+ for( const auto& name : physicalname) {
+ if (skip) { skip=false; ++idx; continue; }//skip first entry
+ G4MyPhysicalVolume* parentPhysVol = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), name, fLogical0, pPhysical0);
+ parentPhysVol->SetCopyNo(copynos[idx]);
+ ++idx;
+ navigationHistory0->NewLevel(parentPhysVol, kNormal, nReplica);
+ }
+ }
G4TouchableHistory* touchableHistory0 = new G4TouchableHistory(*navigationHistory0);
G4TouchableHandle touchableHandle0(touchableHistory0);
stepPoint0->SetTouchableHandle(touchableHandle0);
@@ -157,7 +176,7 @@ TEST_F ( sTGCSensitiveDetectortest, ProcessHits )
HepMcParticleLink plink(barcode);
sTGCSimHitCollection* a = sd2.m_sTGCSimHitCollection.ptr();
- ASSERT_EQ(a->begin()->sTGCId(), -299006); //test if the sTGCId value of the Hit generated by this member function is right, the same below
+ ASSERT_EQ(a->begin()->sTGCId(), -364542); //test if the sTGCId value of the Hit generated by this member function is right, the same below
ASSERT_EQ(a->begin()->globalTime(), 0.5);
ASSERT_EQ(a->begin()->globalPosition(), Amg::Vector3D(0,0,2));
ASSERT_EQ(a->begin()->particleEncoding(), 22);
diff --git a/Simulation/G4Atlas/G4AtlasTools/G4AtlasTools/DerivedG4SensitiveDetectorTestSetting.h b/Simulation/G4Atlas/G4AtlasTools/G4AtlasTools/DerivedG4SensitiveDetectorTestSetting.h
index af3dbc39dca..c1b025d77ed 100644
--- a/Simulation/G4Atlas/G4AtlasTools/G4AtlasTools/DerivedG4SensitiveDetectorTestSetting.h
+++ b/Simulation/G4Atlas/G4AtlasTools/G4AtlasTools/DerivedG4SensitiveDetectorTestSetting.h
@@ -21,10 +21,12 @@
//In this function, the reasons why I use 'new' to define objects instead of using smart pointers are as follows:
// 1. this function aims to set environment for test code, which means the objects that were defined in the function should exist throughout the whole code running. Therefore, defining the objects with 'new' can meet the requirement. If I define them with smart pointer, they will be destruct once they are out of scope.
// 2. this function will only be used in the unit test code for testing the sensitive detector classes based on G4VSensitiveDetector. So it will never be responsible for memory leaks in production jobs.
-void DerivedG4SensitiveDetectorTestSetting(G4Step& sp, G4double& totalenergydeposit, G4String& physicalname, G4String& logicalname1, G4int& copyno, G4ThreeVector& preStepPos, G4ThreeVector& postStepPos, G4double& globaltime0/*for preSP*/, G4double& kineticenergy0/*for preSP*/, G4double& velocity0/*for preSP*/, G4double& globaltime/*for track*/, G4double& kineticenergy/*for track*/, G4double& globaltime1/*for postSP*/, G4double& kineticenergy1/*for postSP*/, G4double& velocity1/*for postSP*/, G4double& steplength, G4double& charge, G4int& encoding, G4int& antiencoding, G4String& astring, G4ProcessType& atype, G4String& nop1, G4String& nop2, G4String& nop3)
+void DerivedG4SensitiveDetectorTestSetting(G4Step& sp, G4double& totalEnergyDeposit, std::vector<G4String>& physicalNames, G4String& logicalName1, std::vector<G4int>& copyNos, G4ThreeVector& preStepPos, G4ThreeVector& postStepPos, G4double& globalTime0/*for preSP*/, G4double& kineticEnergy0/*for preSP*/, G4double& velocity0/*for preSP*/, G4double& globalTime/*for track*/, G4double& kineticEnergy/*for track*/, G4double& globalTime1/*for postSP*/, G4double& kineticEnergy1/*for postSP*/, G4double& velocity1/*for postSP*/, G4double& steplength, G4double& charge, G4int& encoding, G4int& antiencoding, G4String& astring, G4ProcessType& atype, G4String& nop1, G4String& nop2, G4String& nop3)
{
+
+ if (copyNos.size()!=physicalNames.size()) { throw std::runtime_error("ERROR: physicalNames and copyNos must have the same length."); }
//decorate sp with the variable called TotalEnergyDeposit
- G4double TotalEnergyDeposit = totalenergydeposit;//para(i.e. there is a parameter in this line)
+ G4double TotalEnergyDeposit = totalEnergyDeposit;//para(i.e. there is a parameter in this line)
sp.SetTotalEnergyDeposit( TotalEnergyDeposit );
//end
@@ -38,23 +40,37 @@ void DerivedG4SensitiveDetectorTestSetting(G4Step& sp, G4double& totalenergydepo
G4Material* material = man->FindOrBuildMaterial("G4_AIR");
G4String name = "logicalName";
G4LogicalVolume* fLogical = new G4LogicalVolume(box, material, name);
- G4String PhysicalName = physicalname;//para
+ G4String PhysicalName = physicalNames[0];//para
G4VPhysicalVolume* pPhysical = nullptr;
G4MyPhysicalVolume* physicalVolume = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), PhysicalName, fLogical, pPhysical);
- G4int CopyNo = copyno;
+ G4int CopyNo = copyNos[0];
physicalVolume->SetCopyNo(CopyNo);//para
G4int nReplica = 2;
navigationHistory->SetFirstEntry(physicalVolume);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
- navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ if (physicalNames.size()==1) {
+ // temporary workaround
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
+ }
+ else {
+ bool skip(true);
+ size_t idx(0);
+ for( const auto& name : physicalNames) {
+ if (skip) { skip=false; ++idx; continue; }//skip first entry
+ G4MyPhysicalVolume* parentPhysVol = new G4MyPhysicalVolume(0, G4ThreeVector(0,0,0), name, fLogical, pPhysical);
+ parentPhysVol->SetCopyNo(copyNos[idx]);
+ ++idx;
+ navigationHistory->NewLevel(parentPhysVol, kNormal, nReplica);
+ }
+ }
G4TouchableHistory* touchableHistory = new G4TouchableHistory(*navigationHistory);
G4TouchableHandle touchableHandle(touchableHistory);
stepPoint->SetTouchableHandle(touchableHandle);
- G4double GlobalTime0 = globaltime0;
- G4double KineticEnergy0 = kineticenergy0;
+ G4double GlobalTime0 = globalTime0;
+ G4double KineticEnergy0 = kineticEnergy0;
G4double Velocity0 = velocity0;
stepPoint->SetGlobalTime(GlobalTime0);//para
stepPoint->SetKineticEnergy(KineticEnergy0);//para
@@ -66,8 +82,8 @@ void DerivedG4SensitiveDetectorTestSetting(G4Step& sp, G4double& totalenergydepo
//decorate sp with another G4StepPoint object
G4StepPoint* stepPoint1 = new G4StepPoint();
stepPoint1->SetPosition(postStepPos);//para
- G4double GlobalTime1 = globaltime1;
- G4double KineticEnergy1 = kineticenergy1;
+ G4double GlobalTime1 = globalTime1;
+ G4double KineticEnergy1 = kineticEnergy1;
G4double Velocity1 = velocity1;
stepPoint1->SetGlobalTime(GlobalTime1);//para
stepPoint1->SetKineticEnergy(KineticEnergy1);//para
@@ -96,12 +112,12 @@ void DerivedG4SensitiveDetectorTestSetting(G4Step& sp, G4double& totalenergydepo
false, NOP3, Antiencoding//para
);
G4ThreeVector aMomentumDirection(0,0,0);
- G4double aKineticEnergy = kineticenergy;//para
+ G4double aKineticEnergy = kineticEnergy;//para
G4DynamicParticle* dynamicPar = new G4DynamicParticle(particle, aMomentumDirection, aKineticEnergy);
G4double aValueTime = 1;
G4ThreeVector ValuePosition(1.0, 1.0, 1.0);
G4Track* track = new G4Track(dynamicPar, aValueTime, ValuePosition);
- G4double globalTime = globaltime;
+ //G4double globalTime = globalTime;
track->SetGlobalTime(globalTime);//para
int trackID = 3;
track->SetTrackID(trackID);
@@ -109,7 +125,7 @@ void DerivedG4SensitiveDetectorTestSetting(G4Step& sp, G4double& totalenergydepo
G4Box* box1 = new G4Box(boxName1, 1.0, 1.0, 1.0);
G4NistManager* man1 = G4NistManager::Instance();
G4Material* material1 = man1->FindOrBuildMaterial("G4_AIR");
- G4String name2 = logicalname1;//para
+ G4String name2 = logicalName1;//para
G4LogicalVolume* fLogical1 = new G4LogicalVolume(box1, material1, name2);
track->SetLogicalVolumeAtVertex(fLogical1);
G4Step* stepForTrack = new G4Step();
--
GitLab