From ded27bc1a4b0bdb14bc3340c414323ad1668c888 Mon Sep 17 00:00:00 2001
From: flavigny <flavigny@lpccaen.in2p3.fr>
Date: Tue, 6 Jul 2021 18:12:08 +0200
Subject: [PATCH] * Forgot changes in prvious commit
---
NPSimulation/Detectors/Strasse/Strasse.cc | 8 ++++++++
Projects/Strasse/geometry/strasse_CAD.detector | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/NPSimulation/Detectors/Strasse/Strasse.cc b/NPSimulation/Detectors/Strasse/Strasse.cc
index 1c7ba0735..0ee0ab3da 100644
--- a/NPSimulation/Detectors/Strasse/Strasse.cc
+++ b/NPSimulation/Detectors/Strasse/Strasse.cc
@@ -802,6 +802,8 @@ void Strasse::ReadConfiguration(NPL::InputParser parser){
"Inner_PCB_DownstreamWidth",
"Inner_PCB_MidWidth",
"Inner_PCB_Thickness",
+ "Inner_PCB_Ledge",
+ "Inner_PCB_Step",
"Inner_Wafer_TransverseStrips",
"Inner_Wafer_LongitudinalStrips",
"Outer_Wafer_Length",
@@ -818,6 +820,8 @@ void Strasse::ReadConfiguration(NPL::InputParser parser){
"Outer_PCB_DownstreamWidth",
"Outer_PCB_MidWidth",
"Outer_PCB_Thickness",
+ "Outer_PCB_Ledge",
+ "Outer_PCB_Step",
"Outer_Wafer_TransverseStrips",
"Outer_Wafer_LongitudinalStrips",
"Chamber_Thickness",
@@ -848,6 +852,8 @@ void Strasse::ReadConfiguration(NPL::InputParser parser){
Inner_PCB_DownstreamWidth = blocks_info[0]->GetDouble("Inner_PCB_DownstreamWidth","mm");
Inner_PCB_MidWidth = blocks_info[0]->GetDouble("Inner_PCB_MidWidth","mm");
Inner_PCB_Thickness = blocks_info[0]->GetDouble("Inner_PCB_Thickness","mm");
+ Inner_PCB_Ledge = blocks_info[0]->GetDouble("Inner_PCB_Ledge","mm");
+ Inner_PCB_Step = blocks_info[0]->GetDouble("Inner_PCB_Step","mm");
Outer_Wafer_Length = blocks_info[0]->GetDouble("Outer_Wafer_Length","mm");
Outer_Wafer_Width = blocks_info[0]->GetDouble("Outer_Wafer_Width","mm");
Outer_Wafer_Thickness = blocks_info[0]->GetDouble("Outer_Wafer_Thickness","mm");
@@ -864,6 +870,8 @@ void Strasse::ReadConfiguration(NPL::InputParser parser){
Outer_PCB_DownstreamWidth = blocks_info[0]->GetDouble("Outer_PCB_DownstreamWidth","mm");
Outer_PCB_MidWidth = blocks_info[0]->GetDouble("Outer_PCB_MidWidth","mm");
Outer_PCB_Thickness = blocks_info[0]->GetDouble("Outer_PCB_Thickness","mm");
+ Outer_PCB_Ledge = blocks_info[0]->GetDouble("Outer_PCB_Ledge","mm");
+ Outer_PCB_Step = blocks_info[0]->GetDouble("Outer_PCB_Step","mm");
Chamber_Thickness= blocks_info[0]->GetDouble("Chamber_Thickness","mm");
Chamber_Cylinder_Length= blocks_info[0]->GetDouble("Chamber_Cylinder_Length","mm");
Chamber_Radius= blocks_info[0]->GetDouble("Chamber_Radius","mm");
diff --git a/Projects/Strasse/geometry/strasse_CAD.detector b/Projects/Strasse/geometry/strasse_CAD.detector
index 8d28c844b..1acb1346f 100644
--- a/Projects/Strasse/geometry/strasse_CAD.detector
+++ b/Projects/Strasse/geometry/strasse_CAD.detector
@@ -88,10 +88,10 @@ Strasse Outer
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Strasse InactiveMaterial
- Chamber= /Users/flavigny/LPCCloud/home/Documents/STRASSE/Meca_CAD/STEP/STRASSE_Chamber.stl
- Stars= /Users/flavigny/LPCCloud/home/Documents/STRASSE/Meca_CAD/STEP/STRASSE_StarSupports.stl
- Base= /Users/flavigny/LPCCloud/home/Documents/STRASSE/Meca_CAD/STEP/STRASSE_Base.stl
- Blades= /Users/flavigny/LPCCloud/home/Documents/STRASSE/Meca_CAD/STEP/Groupe_6_Blade3.stl
+ Chamber= ./geometry/STRASSE_Chamber.stl
+ Stars= ./geometry/STRASSE_StarSupports.stl
+ Base= ./geometry/STRASSE_Base.stl
+ Blades= ./geometry/STRASSE_Blades.stl
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
%Catana CSV
% Path= geometry/Catana.csv
--
GitLab