* Parametric strasse

NPSimulation/Detectors/Strasse/Strasse.hh

@@ -51,16 +51,17 @@ class Strasse : public NPS::VDetector{
   public:
     // Cylindrical coordinate
     void AddInnerDetector(double R,double Z,double Phi);  
+    void AddOuterDetector(double R,double Z,double Phi);  
 
     G4LogicalVolume* BuildInnerDetector();
-    G4LogicalVolume* BuildOutterDetector();
+    G4LogicalVolume* BuildOuterDetector();
     G4LogicalVolume* BuildElectronic();
     G4LogicalVolume* BuildFrame();
     G4LogicalVolume* BuildChamber();
 
   private:
     G4LogicalVolume* m_InnerDetector;
-    G4LogicalVolume* m_OutterDetector;
+    G4LogicalVolume* m_OuterDetector;
     G4LogicalVolume* m_Electronic;
     G4LogicalVolume* m_Frame;
     G4LogicalVolume* m_Chamber;
@@ -105,7 +106,7 @@ class Strasse : public NPS::VDetector{
 
     //   Associated Scorer
     G4MultiFunctionalDetector* m_InnerScorer ;
-    G4MultiFunctionalDetector* m_OutterScorer ;
+    G4MultiFunctionalDetector* m_OuterScorer ;
     ////////////////////////////////////////////////////
     ///////////Event class to store Data////////////////
     ////////////////////////////////////////////////////
@@ -120,6 +121,10 @@ class Strasse : public NPS::VDetector{
     vector<double>  m_Inner_R; 
     vector<double>  m_Inner_Z;
     vector<double>  m_Inner_Phi; 
+    vector<double>  m_Outer_R; 
+    vector<double>  m_Outer_Z;
+    vector<double>  m_Outer_Phi; 
+
 
     // Visualisation Attribute
     //G4VisAttributes* m_VisTrap;

Projects/MUGAST/Analysis.cxx

@@ -76,7 +76,7 @@ void Analysis::Init() {
   LightTarget = NPL::EnergyLoss(light+"_"+TargetMaterial+".G4table","G4Table",100 );
   LightAl = NPL::EnergyLoss(light+"_Al.G4table","G4Table",100);
   LightSi = NPL::EnergyLoss(light+"_Si.G4table","G4Table",100);
-  BeamCD2 = NPL::EnergyLoss(beam+"_"+TargetMaterial+".G4table","G4Table",00);
+  BeamCD2 = NPL::EnergyLoss(beam+"_"+TargetMaterial+".G4table","G4Table",100);
 
   FinalBeamEnergy = BeamCD2.Slow(OriginalBeamEnergy,TargetThickness*0.5,0); 
   //FinalBeamEnergy = OriginalBeamEnergy; 

Projects/MUGAST/e793.detector

 %%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
 Target
- THICKNESS= 9.43 micrometer
+ THICKNESS= 20 micrometer
  ANGLE= 0 deg
  RADIUS= 10 mm
  MATERIAL= CD2

Projects/Strasse/strasse.detector

 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Target
- THICKNESS= 9.43 micrometer
+ THICKNESS= 150 mm
  ANGLE= 0 deg
- RADIUS= 10 mm
- MATERIAL= CD2
+ RADIUS= 50 mm
+ MATERIAL= LH2
  X= 0 mm
  Y= 0 mm
  Z= 0 mm
- NbSlices= 100
+ NbSlices= 10000
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Strasse Info
+  Inner_Wafer_Length= 100 mm
+  Inner_Wafer_Width= 50 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_PCB_PortWidth= 1 cm
+  Inner_PCB_StarboardWidth= 2 mm
+  Inner_PCB_BevelAngle=  60 deg
+  Inner_PCB_UpstreamWidth= 1 cm
+  Inner_PCB_DownstreamWidth= 2 mm
+  Inner_PCB_MidWidth= 2 mm
+  Inner_PCB_Thickness= 3 mm
+  Outer_Wafer_Length= 150 mm
+  Outer_Wafer_Width= 150 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= 1 cm
+  Outer_PCB_StarboardWidth= 2 mm
+  Outer_PCB_BevelAngle=  60 deg
+  Outer_PCB_UpstreamWidth= 1 cm
+  Outer_PCB_DownstreamWidth= 2 mm
+  Outer_PCB_MidWidth= 2 mm
+  Outer_PCB_Thickness= 3 mm
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
 Strasse Inner
@@ -58,12 +89,52 @@ Strasse Inner
   Z= 100 mm
   Phi= 315 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 0 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 45 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 90 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 135 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 180 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 225 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%7
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 270 deg
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
+Strasse Outer
+  Radius= 200 mm
+  Z= 200 mm
+  Phi= 315 deg