Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into v2.2-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
wdconinc committed Sep 5, 2019
2 parents 59d7928 + 8124ac8 commit 2790229
Show file tree
Hide file tree
Showing 67 changed files with 265 additions and 100 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/remoll/beamcurr 85 microampere
# Make interactions with W, Cu, and Pb
# realistic rather than pure absorbers
/remoll/kryptonite/set true
/control/execute macros/kryptonite.mac
/process/list
# Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
#/remoll/seed 123456
Expand Down
2 changes: 1 addition & 1 deletion analysis/pruneTreeEnvelope/runexample_limit_envelope.mac
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/remoll/beamcurr 85 microampere
# Make interactions with W, Cu, and Pb
# realistic rather than pure absorbers
/remoll/kryptonite/set true
/control/execute macros/kryptonite.mac
/process/list
# Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
#/remoll/seed 123456
Expand Down
2 changes: 1 addition & 1 deletion analysis/pruneTreeEnvelope/runexample_moller_envelope.mac
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/remoll/beamcurr 85 microampere
# Make interactions with W, Cu, and Pb
# realistic rather than pure absorbers
/remoll/kryptonite/set true
/control/execute macros/kryptonite.mac
/process/list
# Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
#/remoll/seed 123456
Expand Down
146 changes: 146 additions & 0 deletions analysis/rootScripts/plotDetPlaneCuts.C
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
#include <utility>
#include <vector>
#include <TString.h>
#include "TCut.h"
#include <list>
#include <dirent.h>
#include <unistd.h>
#include <fstream>
#include <iostream>
#include <sstream>
#include <string>
#include <algorithm>
#include <TSystem.h>
#include <TChain.h>
#include <TFile.h>
#include <TCanvas.h>
#include <TROOT.h>
#include <TH1.h>
#include <TH2.h>
void plotDetPlaneCuts(Double_t r_outer_cut=0, Int_t n_steps = 15, Double_t r_step = 10.0, Double_t z_cut = 27000.0, Int_t detector = 28, TString type = "moller", Int_t radialCut = 1, TString fname = "NULL"){
/* I want to take a given ROOT output file and plot a specific detector's
* hit.x/y/r/theta, etc. distributions (weighted by rate)
* and using cuts that are set at the z_cut position, cutting out all part.tjr
* (calculated radii) tracks that are > r_outer_cut
*
* I would also like to have this loop over r_outer_cut from some initial
* to final in fine steps and make a plot of the number of cut out/in epelastic/moller
* particles (weighted by rate) vs. that cut radius
*
* I would also like to do a similar scan in z maybe... or at least compare at multiple
* z cut places */

if (r_outer_cut==0) {
std::cout<<"Usage: Load Data Root File to gDirectory, root> .x plotDetPlaneCuts(r_outer_cut=0, n_steps = 15, r_step = 10.0, z_cut = 27000.0, detector = 28, type = \"moller\")\n\n"<<std::endl;
return;
}

TChain * T = new TChain("T");
if (fname == "NULL"){
T = (TChain*)gDirectory->Get("T");
}
else {
T->Add(fname);
}
FILE *fp;
fp = fopen(Form("Output_cuts.txt"),"a");

Int_t n_events = 100000;
Int_t start_event_n = 1;
Double_t z_cut_space = 1.0; // mm

const Int_t n_canvases = 100;
const Int_t n_plots = 1;
Double_t norm_rate_weight_all[n_canvases*n_plots];
Double_t norm_rate_weight_in[n_canvases*n_plots];
Double_t norm_rate_weight_out[n_canvases*n_plots];
TCanvas *canvas[n_canvases];
TH1F *totalRate[n_canvases*n_plots];
TH1F *r_inside[n_canvases*n_plots];
TH1F *r_outside[n_canvases*n_plots];
TH2F *xy_inside[n_canvases*n_plots];
TH2F *xy_outside[n_canvases*n_plots];

for (Int_t n_canvas = 0; n_canvas < n_steps; n_canvas++) {
r_outer_cut = r_outer_cut - r_step;
canvas[n_canvas] = new TCanvas(Form("Plot of %s in detector %d hits for z plane %f, r > %f",type.Data(),detector,z_cut,r_outer_cut),Form("Plot of %s in detector %d hits for z plane %f, r > %f",type.Data(),detector,z_cut,r_outer_cut));
canvas[n_canvas]->Divide(n_plots*2,2);
for (Int_t n_plot = 0; n_plot<n_plots; n_plot++){
std::cout<<"Plot number "<<n_canvas*n_plots+n_plot<<", n_canvas "<<n_canvas<<", n_plot "<<n_plot<<std::endl;

canvas[n_canvas]->cd(n_plot+1);
T->Draw(Form("hit.r[0]>>h_totalRate_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f)",detector,z_cut,z_cut_space,z_cut,z_cut_space),"",n_events,start_event_n);
totalRate[n_canvas*n_plots + n_plot] = (TH1F*)gROOT->FindObject(Form("h_totalRate_%d",n_canvas*n_plots + n_plot));
norm_rate_weight_all[n_canvas*n_plots + n_plot] = totalRate[n_canvas*n_plots + n_plot]->Integral();
Printf("Normalization total rate weight = %f",norm_rate_weight_all[n_canvas*n_plots + n_plot]);

// Radial
if (radialCut == 1){
T->Draw(Form("hit.r[0]>>h_r_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
else {
// X cut
T->Draw(Form("hit.r[0]>>h_r_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
r_inside[n_canvas*n_plots + n_plot] = (TH1F*)gROOT->FindObject(Form("h_r_inside_%d",n_canvas*n_plots + n_plot));
norm_rate_weight_in[n_canvas*n_plots + n_plot] = r_inside[n_canvas*n_plots + n_plot]->Integral();

canvas[n_canvas]->cd(n_plot+2);
// Radial
if (radialCut == 1){
T->Draw(Form("hit.r[0]>>h_r_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
// X cut
}
else {
T->Draw(Form("hit.r[0]>>h_r_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
r_outside[n_canvas*n_plots + n_plot] = (TH1F*)gROOT->FindObject(Form("h_r_outside_%d",n_canvas*n_plots + n_plot));
norm_rate_weight_out[n_canvas*n_plots + n_plot] = r_outside[n_canvas*n_plots + n_plot]->Integral();

canvas[n_canvas]->cd(n_plot+3);
// Radial
if (radialCut == 1){
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
else {
// X cut
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
xy_inside[n_canvas*n_plots + n_plot] = (TH2F*)gROOT->FindObject(Form("h_xy_inside_%d",n_canvas*n_plots + n_plot));

canvas[n_canvas]->cd(n_plot+4);
// Radial
if (radialCut == 1){
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
// X cut
else {
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
xy_outside[n_canvas*n_plots + n_plot] = (TH2F*)gROOT->FindObject(Form("h_xy_outside_%d",n_canvas*n_plots + n_plot));

// CAMGUIN feature: writeFile_h takes the name of the variable, the value to set it to, the "run number" which is a unique identifier, the split number (which is another unique identifier), and the number of runs (another one)
//writeFile_h("r_outer_cut", r_outer_cut, r_outer_cut, z_cut, detector*1.0);
//writeFile_h("z_cut", z_cut, r_outer_cut, z_cut, detector*1.0);
//writeFile_h("detector", detector*1.0, r_outer_cut, z_cut, detector*1.0);
//writeFile_h(Form("%s_norm_rate_weight_all",type.Data()), norm_rate_weight_all[n_canvas*n_plots + n_plot], r_outer_cut, z_cut, detector*1.0);
//writeFile_h(Form("%s_norm_rate_weight_in",type.Data()), norm_rate_weight_in[n_canvas*n_plots + n_plot], r_outer_cut, z_cut, detector*1.0);
//writeFile_h(Form("%s_norm_rate_weight_out",type.Data()), norm_rate_weight_out[n_canvas*n_plots + n_plot], r_outer_cut, z_cut, detector*1.0);

if(fp!=NULL){
fprintf(fp,"r_outer_cut = %f, z_cut = %f, detector = %d, %s_norm_rate_weight_all = %f, %s_norm_rate_weight_in = %f, %s_norm_rate_weight_out = %f\n",r_outer_cut,z_cut,detector,type.Data(),norm_rate_weight_all[n_canvas*n_plots + n_plot],type.Data(),norm_rate_weight_in[n_canvas*n_plots + n_plot],type.Data(),norm_rate_weight_out[n_canvas*n_plots + n_plot]);
}
}
if (n_canvas == 0 && n_steps != 1){
canvas[n_canvas]->SaveAs(Form("%s_norm_rate_weight.pdf(",type.Data()));
}
else if (n_canvas < n_steps || n_steps==1) {
canvas[n_canvas]->SaveAs(Form("%s_norm_rate_weight.pdf",type.Data()));
}
else {
canvas[n_canvas]->SaveAs(Form("%s_norm_rate_weight.pdf)",type.Data()));
}
}

fclose(fp);
}
2 changes: 1 addition & 1 deletion geometry/mollerMother_5open.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<physvol>
<file name="detector_5open.gdml"/>
<position name="detectorCenter" x="0" y="0" z="0.0*28500."/>
<position name="detectorCenter" x="0" y="0" z="0.0"/>
<rotation name="rot" unit="deg" x="0" y="90" z="0"/>
</physvol>

Expand Down
5 changes: 1 addition & 4 deletions geometry/mollerMother_black.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
<gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="schema/gdml.xsd">

<define>
<position name="hallCenter" x="0" y="0" z="4000"/>
<position name="targetCenter" x="0" y="0" z="10000"/>
<position name="upstreamCenter" x="0" y="0" z="7000."/>
<position name="hybridCenter" x="0" y="0" z="13366.57"/>
<position name="detectorCenter" x="0" y="0" z="0.0*28500."/>
<position name="detectorCenter" x="0" y="0" z="0.0"/>
<rotation name="rot" unit="deg" x="0" y="90" z="0"/>
</define>

Expand Down
20 changes: 10 additions & 10 deletions geometry/positions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,34 @@
-->

<!-- Hall center position (MOLLER target is upstream of pivot) -->
<position name="hallCenter" x="0" y="0" z="6087." unit="mm"/>
<position name="hallCenter" x="0.0" y="0.0" z="0.0" unit="mm"/>

<!-- Target position -->
<position name="targetCenter" x="0" y="0" z="0" unit="mm"/>
<position name="targetCenter" x="0.0" y="0.0" z="-4587.00" unit="mm"/>

<!-- Upstream spectrometer position -->
<position name="upstreamCenter" x="0" y="0" z="7000." unit="mm"/>
<position name="upstreamCenter" x="0.0" y="0.0" z="1913.00" unit="mm"/>

<!-- Hybrid spectrometer position -->
<position name="hybridCenter" x="0" y="0" z="13366.57" unit="mm"/>
<position name="hybridCenter" x="0.0" y="0.0" z="8279.57" unit="mm"/>

<!-- Physical tracking detector position -->
<position name="trackingCenter" x="0" y="0" z="26635." unit="mm"/>
<position name="trackingCenter" x="0.0" y="0.0" z="20048.00" unit="mm"/>
<!-- Virtual planes in the parallel world -->
<position name="trackingDetectorVirtualPlaneCenter_pos" z="25.635" unit="m"/>
<position name="trackingDetectorVirtualPlaneCenter_pos" z="19048.00" unit="mm"/>
<position name="trackingDetectorVirtualPlaneFront1_pos" z="-1.45" unit="m"/>
<position name="trackingDetectorVirtualPlaneFront2_pos" z="-1.25" unit="m"/>
<position name="trackingDetectorVirtualPlaneBack1_pos" z="+1.25" unit="m"/>
<position name="trackingDetectorVirtualPlaneBack2_pos" z="+1.45" unit="m"/>

<!-- Physical main detector array position -->
<position name="detectorCenter" x="0" y="0" z="28500." unit="mm"/>
<position name="detectorCenter" x="0.0" y="0.0" z="21913.00" unit="mm"/>
<!-- Virtual planes in the parallel world -->
<position name="mainDetectorVirtualPlane_pos" z="28.500" unit="m"/>
<position name="mainDetectorVirtualPlane_pos" z="21913.00" unit="mm"/>

<!-- Z position of the plane about which the two arrays of showermax
detectors are placed -->
<position name="showerMaxDetectorCenter" x="0" y="0" z="28750." unit="mm"/>
<position name="showerMaxDetectorCenter" x="0.0" y="0.0" z="22163.00" unit="mm"/>

<!-- Z position of the center of the lucite stack of the pion detector. -->
<position name="pionDetectorCenter" x="0" y="0" z="29600." unit="mm"/>
<position name="pionDetectorCenter" x="0.0" y="0.0" z="23013.00" unit="mm"/>
2 changes: 1 addition & 1 deletion geometry/target/subTargetRegion.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<define>
&matrices;

<constant name="targetCenterZ" value="500"/>
<constant name="targetCenterZ" value="0"/>
<constant name="tubeTarget_length" value="1250"/>
<constant name="AlWindowTarget_length" value="0.127"/>

Expand Down
2 changes: 1 addition & 1 deletion geometry/target/target12C.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<gdml xmlns:gdml="http://cern.ch/2001/Schemas/GDML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="schema/gdml.xsd">

<define>
<constant name="targetCenterZ" value="500"/>
<constant name="targetCenterZ" value="0"/>
</define>

<materials>
Expand Down
2 changes: 1 addition & 1 deletion geometry/target/targetDaughter.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<gdml xmlns:gdml="http://cern.ch/2001/Schemas/GDML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="schema/gdml.xsd">

<define>
<constant name="targetCenterZ" value="500"/>
<constant name="targetCenterZ" value="0"/>
<constant name="tubeTarget_rmax" value="40"/>
<constant name="tubeTarget_length" value="1250"/>
<constant name="AlWindowTarget_length" value="0.127"/>
Expand Down
2 changes: 1 addition & 1 deletion geometry/target/targetDaughter_Clamshell_Optimized.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<constant name="y_increase_targ" value="0.0"/>
<constant name="YOFFSET_targ" value="-1*y_increase_targ/2"/>

<constant name="targetCenterZ" value="500"/>
<constant name="targetCenterZ" value="0"/>
<constant name="tubeTarget_rmax" value="40"/>
<constant name="tubeTarget_length" value="1250"/>
<constant name="AlWindowTarget_length" value="0.127"/>
Expand Down
2 changes: 1 addition & 1 deletion geometry/target/targetDaughter_acceptanceDefinition.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<constant name="y_increase_targ" value="0.0"/>
<constant name="YOFFSET_targ" value="-1*y_increase_targ/2"/>

<constant name="targetCenterZ" value="500"/>
<constant name="targetCenterZ" value="0"/>
<constant name="tubeTarget_rmax" value="40"/>
<constant name="tubeTarget_length" value="1250"/>
<constant name="AlWindowTarget_length" value="0.127"/>
Expand Down
2 changes: 1 addition & 1 deletion geometry/target/targetDaughter_merged.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<define>
&matrices;

<constant name="targetCenterZ" value="500"/>
<constant name="targetCenterZ" value="0"/>
<constant name="tubeTarget_rmax" value="40"/>
<constant name="tubeTarget_length" value="1250"/>
<constant name="AlWindowTarget_length" value="0.127"/>
Expand Down
2 changes: 1 addition & 1 deletion geometry/target/targetDaughter_noShlds.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<define>
&matrices;

<constant name="targetCenterZ" value="500"/>
<constant name="targetCenterZ" value="0"/>
<constant name="tubeTarget_rmax" value="40"/>
<constant name="tubeTarget_length" value="1250"/>
<constant name="AlWindowTarget_length" value="0.127"/>
Expand Down
13 changes: 8 additions & 5 deletions geometry/upstream/upstreamDaughter_merged.gdml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<!-- Default value before check3 -->
<!-- <constant name="boxUSShieldColl1_inner_rmax" value="140"/> -->
<constant name="USShield1_extension" value="829.5 - 50"/> <!-- subtract 50 to prevent overlaps? - make this parametrized in the future to avoid arbitrariness -->
<constant name="USBoxmother_extensionUS" value="1100"/>
<constant name="USBoxmother_extensionUS" value="0"/>
<constant name="USShield2_extension" value="370 - 90"/> <!-- subtract 90 to prevent overlaps?? -->
<constant name="USBoxmother_extensionDS" value="0"/>
<constant name="boxUSShieldColl1_inner_rmax" value="100"/> <!-- FIXME this is marginally close to the acceptance defining collimator's outer radius of 98 mm and will consequently cause the concrete to absorb a significant amount of power that was otherwise intended for collimator 2-->
Expand All @@ -152,18 +152,21 @@

<!-- Neutron Poly Shielding -->
<!-- PolyShield1 will be outside shielding blocks 2 and 3 -->
<constant name="USPolyShield1_front_thickness" value="200"/>
<constant name="USPolyShield1_back_thickness" value="394 + 400"/>
<constant name="USPolyShield1_side_thickness" value="400 + 400"/>
<constant name="USPolyShield1_top_thickness" value="400 + 400"/>
<constant name="USPolyShield1_bottom_thickness" value="400 + 400"/>
<constant name="USPolyShield1_length" value="USShield1_length + USShield2_length + 1 + 2*USPolyShield1_side_thickness + 100"/>
<constant name="USPolyShield1_length" value="USShield1_length + USShield2_length + 1 + USPolyShield1_front_thickness + USPolyShield1_back_thickness + 100"/>
<constant name="USPolyShield1_width" value="USShield2_width + 1 + 2*USPolyShield1_side_thickness"/>
<constant name="USPolyShield1_height" value="USShield2_height + 1 + USPolyShield1_top_thickness + USPolyShield1_bottom_thickness"/>
<constant name="boxPolyShield1_beam_bore" value="boxUSShieldColl2_inner_rmax + 15"/>
<!--offeset when no bottom shield (USPolyShield1_top_thickness + USPolyShield1_bottom_thickness)/2 -->
<constant name="USPolyShield1_y_offset" value="(USPolyShield1_top_thickness - USPolyShield1_bottom_thickness)/2"/>
<position name="boxUSPolyShield1_trans1" unit="mm" x="0" y="-1*USPolyShield1_top_thickness/2 + USPolyShield1_bottom_thickness/2" z="0"/>
<constant name="USPolyShield1_z_offset" value="(USPolyShield1_back_thickness - USPolyShield1_front_thickness)/2"/>
<position name="boxUSPolyShield1_trans1" unit="mm" x="0" y="-1*USPolyShield1_top_thickness/2 + USPolyShield1_bottom_thickness/2" z="-1*USPolyShield1_back_thickness/2 + USPolyShield1_front_thickness/2"/>
<position name="boxUSPolyShield1_trans2" unit="mm" x="0" y="-1*USPolyShield1_y_offset" z="0"/>
<position name="boxUSPolyShield1_center" unit="mm" x="0" y="USPolyShield1_y_offset" z="5865-UOFFSET-(USShield1_extension-USShield2_extension)/2"/>
<position name="boxUSPolyShield1_center" unit="mm" x="0" y="USPolyShield1_y_offset" z="5865-UOFFSET-(USShield1_extension-USShield2_extension)/2+USPolyShield1_z_offset"/>

<constant name="X_ARC" value="COIL_STRAIGHT_L/2"/>
<constant name="Y1_ARC" value="-INCOILRADIUS-(COIL_ARC_R+XS_H/2)"/>
Expand Down Expand Up @@ -718,7 +721,7 @@
<!-- Neutron Poly Shielding -->
<!-- PolyShield1 will be outside shielding blocks 2 and 3 -->
<box lunit="mm" name="boxUSPolyShield1_solid_1" x="USPolyShield1_width" y="USPolyShield1_height" z="USPolyShield1_length"/>
<box lunit="mm" name="boxUSPolyShield1_solid_2" x="USPolyShield1_width - 2*USPolyShield1_side_thickness + 1" y="USPolyShield1_height - USPolyShield1_top_thickness - USPolyShield1_bottom_thickness + 1" z="USPolyShield1_length - 2*USPolyShield1_side_thickness + 1"/>
<box lunit="mm" name="boxUSPolyShield1_solid_2" x="USPolyShield1_width - 2*USPolyShield1_side_thickness + 1" y="USPolyShield1_height - USPolyShield1_top_thickness - USPolyShield1_bottom_thickness + 1" z="USPolyShield1_length - USPolyShield1_front_thickness - USPolyShield1_back_thickness + 1"/>
<tube aunit="deg" deltaphi="360" lunit="mm" name="USPolyShield1_beamTube_solid" rmax="boxPolyShield1_beam_bore" rmin="0" startphi="0" z="USPolyShield1_length+10"/>

<subtraction name ="boxUSPolyShield1_solid_3">
Expand Down
1 change: 0 additions & 1 deletion include/remollDetectorConstruction.hh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ class remollDetectorConstruction : public G4VUserDetectorConstruction
public:

void SetKryptoniteVerbose(G4int verbose) { fKryptoniteVerbose = verbose; }
void SetKryptoniteEnable(G4String flag);
void EnableKryptonite();
void DisableKryptonite();
void AddKryptoniteCandidate(G4String name);
Expand Down
2 changes: 1 addition & 1 deletion macros/envelope_data.mac
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

# Make interactions with W, Cu, and Pb
# realistic rather than pure absorbers
#/remoll/kryptonite/set true
#/control/execute macros/kryptonite.mac


#create moller output file
Expand Down
Loading

0 comments on commit 2790229

Please sign in to comment.