From b50187432b2fdfdac3dffed638aba4352068b11c Mon Sep 17 00:00:00 2001
From: adrien matta <matta@lpccaen.in2p3.fr>
Date: Fri, 17 Jul 2020 11:04:29 +0200
Subject: [PATCH] * adding alias file for describing strasse geometry

---
 NPLib/Core/NPInputParser.cxx      |  4 +-
 Projects/Strasse/alias.detector   | 86 +++++++++++++++++++++++++++++++
 Projects/Strasse/strasse.detector | 12 ++---
 3 files changed, 94 insertions(+), 8 deletions(-)
 create mode 100644 Projects/Strasse/alias.detector

diff --git a/NPLib/Core/NPInputParser.cxx b/NPLib/Core/NPInputParser.cxx
index 606e2d207..13196d004 100644
--- a/NPLib/Core/NPInputParser.cxx
+++ b/NPLib/Core/NPInputParser.cxx
@@ -392,7 +392,7 @@ void NPL::InputParser::TreatAliases(){
       unsigned int size = m_Block[b]->GetSize();
       size_t pos;  
       // In place case loop over each value and replace them
-      if(action=="Inplace"){
+      if(action=="Replace"){
         for(unsigned int v = 0 ; v < size ; v++){
           while((pos=m_Block[b]->GetValue(v).find(name))!=std::string::npos){
             std::string val = m_Block[b]->GetValue(v);
@@ -402,7 +402,7 @@ void NPL::InputParser::TreatAliases(){
         }
       }
 
-      else if (action=="Split"){
+      else if (action=="Copy"){
         bool check = false;
         // first pass identify if the block use an alias
         for(unsigned int v = 0 ; v < size ; v++){
diff --git a/Projects/Strasse/alias.detector b/Projects/Strasse/alias.detector
new file mode 100644
index 000000000..37f1656b5
--- /dev/null
+++ b/Projects/Strasse/alias.detector
@@ -0,0 +1,86 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Target
+ THICKNESS= 100 mm
+ ANGLE= 0 deg
+ RADIUS= 15 mm
+ MATERIAL= LH2
+ X= 0 mm
+ Y= 0 mm
+ Z= 0 mm
+ NbSlices= 10
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Strasse Info
+  Inner_Wafer_Length= 124 mm
+  Inner_Wafer_Width= 25 mm
+  Inner_Wafer_Thickness= 300 micrometer
+  Inner_Wafer_AlThickness= 0.4 micrometer
+  Inner_Wafer_PADExternal= 1 mm
+  Inner_Wafer_PADInternal= 1 mm
+  Inner_Wafer_GuardRing= 1.5 mm
+  Inner_Wafer_TransverseStrips= 128
+  Inner_Wafer_LongitudinalStrips= 128
+  Inner_PCB_PortWidth= 5 mm
+  Inner_PCB_StarboardWidth= 1 mm
+  Inner_PCB_BevelAngle=  45 deg
+  Inner_PCB_UpstreamWidth= 1 cm
+  Inner_PCB_DownstreamWidth= 1 mm
+  Inner_PCB_MidWidth= 1 mm
+  Inner_PCB_Thickness= 1.6 mm
+  Outer_Wafer_Length= 107 mm
+  Outer_Wafer_Width= 60 mm
+  Outer_Wafer_Thickness= 300 micrometer
+  Outer_Wafer_AlThickness= 0.4 micrometer
+  Outer_Wafer_PADExternal= 1 mm
+  Outer_Wafer_PADInternal= 1 mm
+  Outer_Wafer_GuardRing= 1.5 mm
+  Outer_PCB_PortWidth= 5 mm
+  Outer_PCB_StarboardWidth= 1 mm
+  Outer_PCB_BevelAngle=  45 deg
+  Outer_PCB_UpstreamWidth= 1 cm
+  Outer_PCB_DownstreamWidth= 1 mm
+  Outer_PCB_MidWidth= 1 mm
+  Outer_PCB_Thickness= 1.6 mm
+  Outer_Wafer_TransverseStrips= 128
+  Outer_Wafer_LongitudinalStrips= 128
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Alias InnerShift
+  Action= Replace 
+  Value= 5 
+
+Alias InnerRadius
+  Action= Replace 
+  Value= 30 
+
+Alias InnerPhi
+  Action= Copy
+  Value= 0 60 120 180 240 300
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Alias OuterShift
+  Action= Replace 
+  Value= -5 
+
+Alias OuterRadius
+  Action= Replace 
+  Value= 60 
+
+Alias OuterPhi
+  Action= Copy
+  Value= 0 60 120 180 240 300
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Strasse Inner
+  Radius= @InnerRadius mm
+  Z= 100 mm
+  Phi= @InnerPhi deg
+  Shift= @InnerShift mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Strasse Outer
+  Radius= @OuterRadius mm
+  Z= 129 mm
+  Phi= @OuterPhi deg
+  Shift= @OuterShift mm
+
diff --git a/Projects/Strasse/strasse.detector b/Projects/Strasse/strasse.detector
index ce48b1ed8..f1fbe0b6e 100644
--- a/Projects/Strasse/strasse.detector
+++ b/Projects/Strasse/strasse.detector
@@ -92,40 +92,40 @@ Strasse Outer
   Radius= 60 mm
   Z= 129 mm
   Phi= 0 deg
-  Shift= 5 mm
+  Shift= -5 mm
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
 Strasse Outer
   Radius= 60 mm
   Z= 129 mm
   Phi= 60 deg
-  Shift= 5 mm
+  Shift= -5 mm
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
 Strasse Outer
   Radius= 60 mm
   Z= 129 mm
   Phi= 120 deg
-  Shift= 5 mm
+  Shift= -5 mm
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
 Strasse Outer
   Radius= 60 mm
   Z= 129 mm
   Phi= 180 deg
-  Shift= 5 mm
+  Shift= -5 mm
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
 Strasse Outer
   Radius= 60 mm
   Z= 129 mm
   Phi= 240 deg
-  Shift= 5 mm
+  Shift= -5 mm
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
 Strasse Outer
   Radius= 60 mm
   Z= 129 mm
   Phi= 300 deg
-  Shift= 5 mm
+  Shift= -5 mm
 
-- 
GitLab