From fbb5031850f3216e88964574ceb2629f8b316947 Mon Sep 17 00:00:00 2001
From: Louis Lemair <lemair@lpccaen.in2p3.fr>
Date: Tue, 15 Mar 2022 15:30:39 +0100
Subject: [PATCH] * Changing Nebula simulation token from Nebula to NEBULA
---
NPSimulation/Detectors/Nebula/Nebula.cc | 7 ++--
Projects/Nebula/Nebula.detector | 54 ++++++++++++++++++++++---
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/NPSimulation/Detectors/Nebula/Nebula.cc b/NPSimulation/Detectors/Nebula/Nebula.cc
index 876e6260e..98648115a 100644
--- a/NPSimulation/Detectors/Nebula/Nebula.cc
+++ b/NPSimulation/Detectors/Nebula/Nebula.cc
@@ -53,7 +53,6 @@
using namespace std;
using namespace CLHEP;
-
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
namespace Nebula_NS{
// Energy and time Resolution
@@ -141,7 +140,7 @@ G4LogicalVolume* Nebula::BuildVeto(){
// Read stream at Configfile to pick-up parameters of detector (Position,...)
// Called in DetecorConstruction::ReadDetextorConfiguration Method
void Nebula::ReadConfiguration(NPL::InputParser parser){
- vector<NPL::InputBlock*> blocks = parser.GetAllBlocksWithToken("Nebula");
+ vector<NPL::InputBlock*> blocks = parser.GetAllBlocksWithToken("NEBULA");
if(NPOptionManager::getInstance()->GetVerboseLevel())
cout << "//// " << blocks.size() << " detectors found " << endl;
@@ -282,8 +281,8 @@ extern"C" {
class proxy_nps_Nebula{
public:
proxy_nps_Nebula(){
- NPS::DetectorFactory::getInstance()->AddToken("Nebula","Nebula");
- NPS::DetectorFactory::getInstance()->AddDetector("Nebula",Nebula::Construct);
+ NPS::DetectorFactory::getInstance()->AddToken("NEBULA","NEBULA");
+ NPS::DetectorFactory::getInstance()->AddDetector("NEBULA",Nebula::Construct);
}
};
diff --git a/Projects/Nebula/Nebula.detector b/Projects/Nebula/Nebula.detector
index f46956bad..bac1199e6 100644
--- a/Projects/Nebula/Nebula.detector
+++ b/Projects/Nebula/Nebula.detector
@@ -6,15 +6,15 @@ Target
ANGLE= 0 deg
X= 0 mm
Y= 0 mm
- Z= 0 mm
+ Z= -4000 mm
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Nebula
+NEBULA
POS= 0 0 5 m
NumberOfModule= 30
Veto= 1
Frame= 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Nebula
+NEBULA
POS= 0 0 5.15 m
NumberOfModule= 30
Veto= 0
@@ -22,16 +22,60 @@ Nebula
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Nebula
+NEBULA
POS= 0 0 10 m
NumberOfModule= 30
Veto= 1
Frame= 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Nebula
+NEBULA
POS= 0 0 10.15 m
NumberOfModule= 30
Veto= 0
Frame= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+NEBULA
+ POS= 0 0 3 m
+ NumberOfModule= 15
+ Veto= 1
+ Frame= 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+NEBULA
+ POS= 0 0 3.15 m
+ NumberOfModule= 15
+ Veto= 0
+ Frame= 0
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Samurai
+% POS= 0 0 0 mm
+% ANGLE= 30 deg
+% %
+% METHOD= 1
+% % 0=RungeKutta, 1=EliaOmar
+% FIELDMAP=3T.table.bin
+% %fieldmap/3T.table.bin
+% % fieldmap path
+% STEPS_PER_METER= 1000
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%SAMURAIFDC1
+% %XML= db/SAMURAIFDC0_20200109.xml
+% %Offset= -0.00666226 0.102191 -3370.01 mm
+% Offset= -0.00666226 0.102191 -4370.01 mm
+% %InvertX= 1
+% %InvertY= 0
+% %InvertD= 1
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%SAMURAIFDC2
+% %XML= db/SAMURAIFDC2.xml
+% Offset= 1000 200 5000 mm
+% OffAngle= 59.930 deg
+% %-252.416 -0.228477 4122.57 mm
+% %InvertX= 0
+% %InvertY= 1
+% %InvertD= 1
+
+%
--
GitLab