Implement interim solution with SST parameters (ShipSoft#490)

* Implement interim solution with SST parameters

Retain plane parameters for SST momentarily

* Update strawtubes.h to allow using non-integer stereo angles

* Fix issue with SST parameters (ShipSoft#489)

CHANGELOG.md

@@ -24,6 +24,7 @@ it in future.
 
 * Remove trailing whitespace and fix line endings
 * Fix compilation warnings due to deprecations #469
+* Fix issue with SST parameters #489
 
 ### Changed
 

geometry/geometry_config.py

@@ -174,7 +174,9 @@
      c.strawtubes.InnerStrawDiameter = 1.9928 * u.cm
      c.strawtubes.StrawPitch = 2. * u.cm
      c.strawtubes.DeltazLayer = 1.732 * u.cm
+     c.strawtubes.DeltazPlane = 0 * u.cm   
      c.strawtubes.YLayerOffset = 1. * u.cm
+     c.strawtubes.YPlaneOffset = 0 * u.cm   
      c.strawtubes.FrameMaterial = "steel"
      c.strawtubes.FrameLateralWidth = 0.25 * u.m
      c.strawtubes.DeltazFrame = 2.5 * u.cm

strawtubes/strawtubes.cxx

@@ -242,7 +242,7 @@ void strawtubes::SetStrawsPerLayer(Int_t strawsperlayer)
      fStraws_per_layer = strawsperlayer;                         //! number of straws in one layer
 }
 
-void strawtubes::SetStereoAngle(Int_t stereoangle)
+void strawtubes::SetStereoAngle(Double_t stereoangle)
 {
      fView_angle = stereoangle;                                  //! Stereo angle of planes in a view
      fcosphi=cos(TMath::Pi()*fView_angle/180.);
@@ -478,7 +478,7 @@ void strawtubes::ConstructGeometry()
 
       TGeoTranslation t5p;
 
-      for (Int_t pnb=0; pnb<2; pnb++) {
+      for (Int_t pnb=0; pnb<1; pnb++) {
 	 //plane loop
          TString nmplane_veto = nmveto+"_plane_"; nmplane_veto += pnb;
 	 //width of the planes: z distance between layers + outer straw diameter
@@ -620,7 +620,7 @@ void strawtubes::ConstructGeometry()
 	    vac_12->AddNode(viewframe_12, statnb*10000000+vnb*1000000,h5);
 	    viewframe_12->SetLineColor(kRed);
 
-	    for (Int_t pnb=0; pnb<2; pnb++) {
+	    for (Int_t pnb=0; pnb<1; pnb++) {
 	      //plane loop
 	      TString nmplane_12 = nmview_12+"_plane_";
 	      nmplane_12 += pnb;
@@ -717,7 +717,7 @@ void strawtubes::ConstructGeometry()
 	    vac->AddNode(viewframe, statnb*10000000+vnb*1000000,h5);
 	    viewframe->SetLineColor(kRed);
 
-	    for (Int_t pnb=0; pnb<2; pnb++) {
+	    for (Int_t pnb=0; pnb<1; pnb++) {
 	      //plane loop
 	      TString nmplane = nmview+"_plane_";
 	      nmplane += pnb;

strawtubes/strawtubes.h

@@ -52,7 +52,7 @@ class strawtubes: public FairDetector
     void SetDeltazLayer(Double_t deltazlayer);
     void SetDeltazPlane(Double_t deltazplane);
     void SetStrawsPerLayer(Int_t strawsperlayer);
-    void SetStereoAngle(Int_t stereoangle);
+    void SetStereoAngle(Double_t stereoangle);
     void SetWireThickness(Double_t wirethickness);
     void SetDeltazFrame(Double_t deltazframe);
     void SetFrameLateralWidth(Double_t framelateralwidth);