From db7b6a80f44db3407fe0564c5b7c2083852a6530 Mon Sep 17 00:00:00 2001
From: Kamil Sedlak <kamil.sedlak@psi.ch>
Date: Thu, 7 Feb 2013 09:43:42 +0000
Subject: [PATCH] Kamil Sedlak 7.2.2013 Added geometric shape 
 "BarWithBevelledEdgesX"  used for Alexey's investigation of light transport
 throuhg a scintillator bar. This version is done before implementing changes
 made by James Lord

---
 musrSimAna/musrAnalysis.cxx     |  1 +
 run/README.TXT                  | 26 ++++++++++++++++++++++++++
 src/musrDetectorConstruction.cc | 26 ++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/musrSimAna/musrAnalysis.cxx b/musrSimAna/musrAnalysis.cxx
index 972ff96..fa70903 100644
--- a/musrSimAna/musrAnalysis.cxx
+++ b/musrSimAna/musrAnalysis.cxx
@@ -1184,6 +1184,7 @@ void musrAnalysis::FillHistograms(Int_t iiiEntry) {
     //   det_time0 = timeBin0*tdcresolution;
     //    det_time1 = timeBin1*tdcresolution;
     det_time10 = ((timeBin0==-100000000)|| (timeBin1==-100000000)) ? -100000000 : (timeBin1-timeBin0)*tdcresolution;
+    //PROMPT PEAK INVESTIGATION:    if (timeBin1-timeBin0==7) std::cout<<"HHHHHHHHHHHH eventID="<<eventID<<",  t0="<<timeBin0*tdcresolution<<std::endl;
     det_time20 = ((timeBin0==-100000000)|| (timeBin2==-100000000)) ? -100000000 : (timeBin2-timeBin0)*tdcresolution;
     //cks    if ((det_time10>-1)&&(det_time10<0.01)) {std::cout<<" eventID="<<eventID<<"   det_time10="<< det_time10<<std::endl;}
     gen_time10 = muDecayTime-muM0Time;
diff --git a/run/README.TXT b/run/README.TXT
index 4fea35a..c16cd69 100644
--- a/run/README.TXT
+++ b/run/README.TXT
@@ -179,7 +179,17 @@ SPIN ROTATOR STUDY
 
 ==================================================================================================
 HIGH FIELD
+14602-12 ... based on 14601 (generated by perl script), but varying the sample (and also cryostat) position.
+	   All at 1 T field.
+14601 ... based on 14600, but with wide TURTLE beam, and with some modifications in the detector numbering
+          (to be closer to my earlier numbering).  Field of 1T.
+14600 ... file from J. Rodrigez (ALC-modified flow cryostat)
+14593-4 ... like 14591-2 but with point-like beam.
+14592 ... like 14591 but 10M events and only interesting events saved 
+14591 ... like 145?? but with longitudinal polarisation, field only 50 Gaus (transvers.)
+          --> Robert wants to know the long. ampl. of asymm.
 145?? ... like 144??, but all events saved and statistics only 1M.
+1448? ... like 14452 but very large statistics
 144?? ... based on 14060; updated geometry according to the latest knowledge; 8+1 validation counters
 143?? ... 28.3.2012 quick (dirthy) test with flow cryostat requested by Robert - using the 0.4 mm Cu shield  
 142?? ... 28.3.2012 quick (dirthy) test with flow cryostat requested by Robert - using the 1.0 mm Al shield  
@@ -1035,6 +1045,22 @@ BEAMLINE OSCILLATIONS for Aldo:
 100001 ... muon beam properties in the target: OI magnet, muons start at z =~ -130cm.
 
 -------------------------------------------------------------------------------------
+24632? ... like 24628 but with 100% diffusion scattering.
+24631? ... like 24630? but air properties commented out - 10 times higher number of photons!
+24630? ... to investigate why 24628? failed (World replaced by "vzduch") - no difference found
+24629? ... like 24624? but with "polished unified" and diffusive scat. near edges.
+24628? ... like 24621? but with 10% diffusive scat.
+24627? ... like 24622? but 5x5 mm.
+24626? ... like 24621? but 5x5 mm.
+24625? ... like 24620? but 5x5 mm.
+24624? ... like 24620? but with the "groundair LUT" near edges (0.1 mm)
+24623? ... like 24620? but with the bevelled edges
+24622? ... like 24620? but with "polishedair LUT" surface
+24621? ... like 24620? but with "polished unified" surface
+24620? ... B418, SPTR=230, ideal box, ideal surface  (20.7.2012)
+
+24615? ... like 24604? but with polishedteflonair LUT
+24614? ... like 24604? but with the beam off-center (Alexey wanted to see if it plays a role)
 24613? ... like 24605 but for thinner scintillator bar
 24610-2? ... like 24607?-9? but for the scintillator BC418
 24607-9? ... like 24604?-6? but for attenuation length of 80 mm
diff --git a/src/musrDetectorConstruction.cc b/src/musrDetectorConstruction.cc
index 20101ee..5bd84b2 100644
--- a/src/musrDetectorConstruction.cc
+++ b/src/musrDetectorConstruction.cc
@@ -356,6 +356,32 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct()  {
 	  G4Transform3D transform(rot,zTrans);
 	  solid =  new G4SubtractionSolid(solidName, box1, box2, transform);
 	}
+	else if (strcmp(tmpString2,"BarWithBevelledEdgesX")==0){
+	  // box, which has "cut out" edges.
+	  //       x1,x2,x3 ... dimensions of box (half-lengths)
+	  //       x4       ... full width, which will be cut out at the edge (x4 from one side, and the same x4 from the other side).
+	  //                    four edges will be cut out (edges parallel with the x direction)
+	  sscanf(&line[0],"%*s %*s %*s %s %lf %lf %lf %lf %s %lf %lf %lf %s %s",
+		 name,&x1,&x2,&x3,&x4,material,&posx,&posy,&posz,mothersName,rotMatrix);
+	  sscanf(&line[0],"%*s %*s %*s %*s %*g %*g %*g %*g %*s %*g %*g %*g %*s %*s %s %d %s",sensitiveDet,&volumeID,actualFieldName);
+	  solidName+=name;
+
+	  G4Box* box1 = new G4Box("Box1",x1*mm,x2*mm,x3*mm);
+	  G4Box* box2 = new G4Box("Box2",(x1+1.0)*mm,x4*sqrt(2.)*mm,x4*sqrt(2.)*mm);
+	  G4RotationMatrix rot(0,45*deg,0);
+	  G4ThreeVector zTransA(0,x2*mm,x3*mm);
+	  G4ThreeVector zTransB(0,-x2*mm,x3*mm);
+	  G4ThreeVector zTransC(0,x2*mm,-x3*mm);
+	  G4ThreeVector zTransD(0,-x2*mm,-x3*mm);
+	  G4Transform3D transformA(rot,zTransA);
+	  G4Transform3D transformB(rot,zTransB);
+	  G4Transform3D transformC(rot,zTransC);
+	  G4Transform3D transformD(rot,zTransD);
+	  G4SubtractionSolid* box3 =  new G4SubtractionSolid("tmpBox3", box1, box2, transformA);
+	  G4SubtractionSolid* box4 =  new G4SubtractionSolid("tmpBox4", box3, box2, transformB);
+	  G4SubtractionSolid* box5 =  new G4SubtractionSolid("tmpBox5", box4, box2, transformC);
+	  solid =  new G4SubtractionSolid(solidName, box5, box2, transformD);
+	}
 	else if (strcmp(tmpString2,"alcSupportPlate")==0){
 	  // Create an ALC holder geometry:  x1 half-width of the holder (as a box),
           //                                 x2 half-height of the spacer