diff --git a/Inputs/CrossSection/sofia.txt b/Inputs/CrossSection/sofia.txt
index f746adbf9d162c0542da29ded000378c368537be..5d506fac11e270e9377a9335637a4d608fc5e074 100644
--- a/Inputs/CrossSection/sofia.txt
+++ b/Inputs/CrossSection/sofia.txt
@@ -1,53 +1,1802 @@
-0 1
-0.1 1
-0.2 1
-0.3 1
-0.4 1
-0.5 1
-0.6 1
-0.7 1
-0.8 1
-0.9 1
-1 1
-1.1 1
-1.2 1
-1.3 1
-1.4 1
-1.5 1
-1.6 1
-1.7 1
-1.8 1
-1.9 1
-2 1
-2.1 1
-2.2 1
-2.3 1
-2.4 1
-2.5 1
-2.6 1
-2.7 1
-2.8 1
-2.9 1
-3 1
-3.1 1
-3.2 1
-3.3 1
-3.4 1
-3.5 1
-3.6 1
-3.7 1
-3.8 1
-3.9 1
-4 1
-4.1 0
-4.2 0
-4.3 0
-4.4 0
-4.5 0
-4.6 0
-4.7 0
-4.8 0
-4.9 0
-5 0
-5.1 0
-180 0
+0 1
+0.1 1
+0.2 1
+0.3 1
+0.4 1
+0.5 1
+0.6 0
+0.7 0
+0.8 0
+0.9 0
+1 0
+1.1 0
+1.2 0
+1.3 0
+1.4 0
+1.5 0
+1.6 0
+1.7 0
+1.8 0
+1.9 0
+2 0
+2.1 0
+2.2 0
+2.3 0
+2.4 0
+2.5 0
+2.6 0
+2.7 0
+2.8 0
+2.9 0
+3 0
+3.1 0
+3.2 0
+3.3 0
+3.4 0
+3.5 0
+3.6 0
+3.7 0
+3.8 0
+3.9 0
+4 0
+4.1 0
+4.2 0
+4.3 0
+4.4 0
+4.5 0
+4.6 0
+4.7 0
+4.8 0
+4.9 0
+5 0
+5.1 0
+5.2 0
+5.3 0
+5.4 0
+5.5 0
+5.6 0
+5.7 0
+5.8 0
+5.9 0
+6 0
+6.1 0
+6.2 0
+6.3 0
+6.4 0
+6.5 0
+6.6 0
+6.7 0
+6.8 0
+6.9 0
+7 0
+7.1 0
+7.2 0
+7.3 0
+7.4 0
+7.5 0
+7.6 0
+7.7 0
+7.8 0
+7.9 0
+8 0
+8.1 0
+8.2 0
+8.3 0
+8.4 0
+8.5 0
+8.6 0
+8.7 0
+8.8 0
+8.9 0
+9 0
+9.1 0
+9.2 0
+9.3 0
+9.4 0
+9.5 0
+9.6 0
+9.7 0
+9.8 0
+9.9 0
+10 0
+10.1 0
+10.2 0
+10.3 0
+10.4 0
+10.5 0
+10.6 0
+10.7 0
+10.8 0
+10.9 0
+11 0
+11.1 0
+11.2 0
+11.3 0
+11.4 0
+11.5 0
+11.6 0
+11.7 0
+11.8 0
+11.9 0
+12 0
+12.1 0
+12.2 0
+12.3 0
+12.4 0
+12.5 0
+12.6 0
+12.7 0
+12.8 0
+12.9 0
+13 0
+13.1 0
+13.2 0
+13.3 0
+13.4 0
+13.5 0
+13.6 0
+13.7 0
+13.8 0
+13.9 0
+14 0
+14.1 0
+14.2 0
+14.3 0
+14.4 0
+14.5 0
+14.6 0
+14.7 0
+14.8 0
+14.9 0
+15 0
+15.1 0
+15.2 0
+15.3 0
+15.4 0
+15.5 0
+15.6 0
+15.7 0
+15.8 0
+15.9 0
+16 0
+16.1 0
+16.2 0
+16.3 0
+16.4 0
+16.5 0
+16.6 0
+16.7 0
+16.8 0
+16.9 0
+17 0
+17.1 0
+17.2 0
+17.3 0
+17.4 0
+17.5 0
+17.6 0
+17.7 0
+17.8 0
+17.9 0
+18 0
+18.1 0
+18.2 0
+18.3 0
+18.4 0
+18.5 0
+18.6 0
+18.7 0
+18.8 0
+18.9 0
+19 0
+19.1 0
+19.2 0
+19.3 0
+19.4 0
+19.5 0
+19.6 0
+19.7 0
+19.8 0
+19.9 0
+20 0
+20.1 0
+20.2 0
+20.3 0
+20.4 0
+20.5 0
+20.6 0
+20.7 0
+20.8 0
+20.9 0
+21 0
+21.1 0
+21.2 0
+21.3 0
+21.4 0
+21.5 0
+21.6 0
+21.7 0
+21.8 0
+21.9 0
+22 0
+22.1 0
+22.2 0
+22.3 0
+22.4 0
+22.5 0
+22.6 0
+22.7 0
+22.8 0
+22.9 0
+23 0
+23.1 0
+23.2 0
+23.3 0
+23.4 0
+23.5 0
+23.6 0
+23.7 0
+23.8 0
+23.9 0
+24 0
+24.1 0
+24.2 0
+24.3 0
+24.4 0
+24.5 0
+24.6 0
+24.7 0
+24.8 0
+24.9 0
+25 0
+25.1 0
+25.2 0
+25.3 0
+25.4 0
+25.5 0
+25.6 0
+25.7 0
+25.8 0
+25.9 0
+26 0
+26.1 0
+26.2 0
+26.3 0
+26.4 0
+26.5 0
+26.6 0
+26.7 0
+26.8 0
+26.9 0
+27 0
+27.1 0
+27.2 0
+27.3 0
+27.4 0
+27.5 0
+27.6 0
+27.7 0
+27.8 0
+27.9 0
+28 0
+28.1 0
+28.2 0
+28.3 0
+28.4 0
+28.5 0
+28.6 0
+28.7 0
+28.8 0
+28.9 0
+29 0
+29.1 0
+29.2 0
+29.3 0
+29.4 0
+29.5 0
+29.6 0
+29.7 0
+29.8 0
+29.9 0
+30 0
+30.1 0
+30.2 0
+30.3 0
+30.4 0
+30.5 0
+30.6 0
+30.7 0
+30.8 0
+30.9 0
+31 0
+31.1 0
+31.2 0
+31.3 0
+31.4 0
+31.5 0
+31.6 0
+31.7 0
+31.8 0
+31.9 0
+32 0
+32.1 0
+32.2 0
+32.3 0
+32.4 0
+32.5 0
+32.6 0
+32.7 0
+32.8 0
+32.9 0
+33 0
+33.1 0
+33.2 0
+33.3 0
+33.4 0
+33.5 0
+33.6 0
+33.7 0
+33.8 0
+33.9 0
+34 0
+34.1 0
+34.2 0
+34.3 0
+34.4 0
+34.5 0
+34.6 0
+34.7 0
+34.8 0
+34.9 0
+35 0
+35.1 0
+35.2 0
+35.3 0
+35.4 0
+35.5 0
+35.6 0
+35.7 0
+35.8 0
+35.9 0
+36 0
+36.1 0
+36.2 0
+36.3 0
+36.4 0
+36.5 0
+36.6 0
+36.7 0
+36.8 0
+36.9 0
+37 0
+37.1 0
+37.2 0
+37.3 0
+37.4 0
+37.5 0
+37.6 0
+37.7 0
+37.8 0
+37.9 0
+38 0
+38.1 0
+38.2 0
+38.3 0
+38.4 0
+38.5 0
+38.6 0
+38.7 0
+38.8 0
+38.9 0
+39 0
+39.1 0
+39.2 0
+39.3 0
+39.4 0
+39.5 0
+39.6 0
+39.7 0
+39.8 0
+39.9 0
+40 0
+40.1 0
+40.2 0
+40.3 0
+40.4 0
+40.5 0
+40.6 0
+40.7 0
+40.8 0
+40.9 0
+41 0
+41.1 0
+41.2 0
+41.3 0
+41.4 0
+41.5 0
+41.6 0
+41.7 0
+41.8 0
+41.9 0
+42 0
+42.1 0
+42.2 0
+42.3 0
+42.4 0
+42.5 0
+42.6 0
+42.7 0
+42.8 0
+42.9 0
+43 0
+43.1 0
+43.2 0
+43.3 0
+43.4 0
+43.5 0
+43.6 0
+43.7 0
+43.8 0
+43.9 0
+44 0
+44.1 0
+44.2 0
+44.3 0
+44.4 0
+44.5 0
+44.6 0
+44.7 0
+44.8 0
+44.9 0
+45 0
+45.1 0
+45.2 0
+45.3 0
+45.4 0
+45.5 0
+45.6 0
+45.7 0
+45.8 0
+45.9 0
+46 0
+46.1 0
+46.2 0
+46.3 0
+46.4 0
+46.5 0
+46.6 0
+46.7 0
+46.8 0
+46.9 0
+47 0
+47.1 0
+47.2 0
+47.3 0
+47.4 0
+47.5 0
+47.6 0
+47.7 0
+47.8 0
+47.9 0
+48 0
+48.1 0
+48.2 0
+48.3 0
+48.4 0
+48.5 0
+48.6 0
+48.7 0
+48.8 0
+48.9 0
+49 0
+49.1 0
+49.2 0
+49.3 0
+49.4 0
+49.5 0
+49.6 0
+49.7 0
+49.8 0
+49.9 0
+50 0
+50.1 0
+50.2 0
+50.3 0
+50.4 0
+50.5 0
+50.6 0
+50.7 0
+50.8 0
+50.9 0
+51 0
+51.1 0
+51.2 0
+51.3 0
+51.4 0
+51.5 0
+51.6 0
+51.7 0
+51.8 0
+51.9 0
+52 0
+52.1 0
+52.2 0
+52.3 0
+52.4 0
+52.5 0
+52.6 0
+52.7 0
+52.8 0
+52.9 0
+53 0
+53.1 0
+53.2 0
+53.3 0
+53.4 0
+53.5 0
+53.6 0
+53.7 0
+53.8 0
+53.9 0
+54 0
+54.1 0
+54.2 0
+54.3 0
+54.4 0
+54.5 0
+54.6 0
+54.7 0
+54.8 0
+54.9 0
+55 0
+55.1 0
+55.2 0
+55.3 0
+55.4 0
+55.5 0
+55.6 0
+55.7 0
+55.8 0
+55.9 0
+56 0
+56.1 0
+56.2 0
+56.3 0
+56.4 0
+56.5 0
+56.6 0
+56.7 0
+56.8 0
+56.9 0
+57 0
+57.1 0
+57.2 0
+57.3 0
+57.4 0
+57.5 0
+57.6 0
+57.7 0
+57.8 0
+57.9 0
+58 0
+58.1 0
+58.2 0
+58.3 0
+58.4 0
+58.5 0
+58.6 0
+58.7 0
+58.8 0
+58.9 0
+59 0
+59.1 0
+59.2 0
+59.3 0
+59.4 0
+59.5 0
+59.6 0
+59.7 0
+59.8 0
+59.9 0
+60 0
+60.1 0
+60.2 0
+60.3 0
+60.4 0
+60.5 0
+60.6 0
+60.7 0
+60.8 0
+60.9 0
+61 0
+61.1 0
+61.2 0
+61.3 0
+61.4 0
+61.5 0
+61.6 0
+61.7 0
+61.8 0
+61.9 0
+62 0
+62.1 0
+62.2 0
+62.3 0
+62.4 0
+62.5 0
+62.6 0
+62.7 0
+62.8 0
+62.9 0
+63 0
+63.1 0
+63.2 0
+63.3 0
+63.4 0
+63.5 0
+63.6 0
+63.7 0
+63.8 0
+63.9 0
+64 0
+64.1 0
+64.2 0
+64.3 0
+64.4 0
+64.5 0
+64.6 0
+64.7 0
+64.8 0
+64.9 0
+65 0
+65.1 0
+65.2 0
+65.3 0
+65.4 0
+65.5 0
+65.6 0
+65.7 0
+65.8 0
+65.9 0
+66 0
+66.1 0
+66.2 0
+66.3 0
+66.4 0
+66.5 0
+66.6 0
+66.7 0
+66.8 0
+66.9 0
+67 0
+67.1 0
+67.2 0
+67.3 0
+67.4 0
+67.5 0
+67.6 0
+67.7 0
+67.8 0
+67.9 0
+68 0
+68.1 0
+68.2 0
+68.3 0
+68.4 0
+68.5 0
+68.6 0
+68.7 0
+68.8 0
+68.9 0
+69 0
+69.1 0
+69.2 0
+69.3 0
+69.4 0
+69.5 0
+69.6 0
+69.7 0
+69.8 0
+69.9 0
+70 0
+70.1 0
+70.2 0
+70.3 0
+70.4 0
+70.5 0
+70.6 0
+70.7 0
+70.8 0
+70.9 0
+71 0
+71.1 0
+71.2 0
+71.3 0
+71.4 0
+71.5 0
+71.6 0
+71.7 0
+71.8 0
+71.9 0
+72 0
+72.1 0
+72.2 0
+72.3 0
+72.4 0
+72.5 0
+72.6 0
+72.7 0
+72.8 0
+72.9 0
+73 0
+73.1 0
+73.2 0
+73.3 0
+73.4 0
+73.5 0
+73.6 0
+73.7 0
+73.8 0
+73.9 0
+74 0
+74.1 0
+74.2 0
+74.3 0
+74.4 0
+74.5 0
+74.6 0
+74.7 0
+74.8 0
+74.9 0
+75 0
+75.1 0
+75.2 0
+75.3 0
+75.4 0
+75.5 0
+75.6 0
+75.7 0
+75.8 0
+75.9 0
+76 0
+76.1 0
+76.2 0
+76.3 0
+76.4 0
+76.5 0
+76.6 0
+76.7 0
+76.8 0
+76.9 0
+77 0
+77.1 0
+77.2 0
+77.3 0
+77.4 0
+77.5 0
+77.6 0
+77.7 0
+77.8 0
+77.9 0
+78 0
+78.1 0
+78.2 0
+78.3 0
+78.4 0
+78.5 0
+78.6 0
+78.7 0
+78.8 0
+78.9 0
+79 0
+79.1 0
+79.2 0
+79.3 0
+79.4 0
+79.5 0
+79.6 0
+79.7 0
+79.8 0
+79.9 0
+80 0
+80.1 0
+80.2 0
+80.3 0
+80.4 0
+80.5 0
+80.6 0
+80.7 0
+80.8 0
+80.9 0
+81 0
+81.1 0
+81.2 0
+81.3 0
+81.4 0
+81.5 0
+81.6 0
+81.7 0
+81.8 0
+81.9 0
+82 0
+82.1 0
+82.2 0
+82.3 0
+82.4 0
+82.5 0
+82.6 0
+82.7 0
+82.8 0
+82.9 0
+83 0
+83.1 0
+83.2 0
+83.3 0
+83.4 0
+83.5 0
+83.6 0
+83.7 0
+83.8 0
+83.9 0
+84 0
+84.1 0
+84.2 0
+84.3 0
+84.4 0
+84.5 0
+84.6 0
+84.7 0
+84.8 0
+84.9 0
+85 0
+85.1 0
+85.2 0
+85.3 0
+85.4 0
+85.5 0
+85.6 0
+85.7 0
+85.8 0
+85.9 0
+86 0
+86.1 0
+86.2 0
+86.3 0
+86.4 0
+86.5 0
+86.6 0
+86.7 0
+86.8 0
+86.9 0
+87 0
+87.1 0
+87.2 0
+87.3 0
+87.4 0
+87.5 0
+87.6 0
+87.7 0
+87.8 0
+87.9 0
+88 0
+88.1 0
+88.2 0
+88.3 0
+88.4 0
+88.5 0
+88.6 0
+88.7 0
+88.8 0
+88.9 0
+89 0
+89.1 0
+89.2 0
+89.3 0
+89.4 0
+89.5 0
+89.6 0
+89.7 0
+89.8 0
+89.9 0
+90 0
+90.1 0
+90.2 0
+90.3 0
+90.4 0
+90.5 0
+90.6 0
+90.7 0
+90.8 0
+90.9 0
+91 0
+91.1 0
+91.2 0
+91.3 0
+91.4 0
+91.5 0
+91.6 0
+91.7 0
+91.8 0
+91.9 0
+92 0
+92.1 0
+92.2 0
+92.3 0
+92.4 0
+92.5 0
+92.6 0
+92.7 0
+92.8 0
+92.9 0
+93 0
+93.1 0
+93.2 0
+93.3 0
+93.4 0
+93.5 0
+93.6 0
+93.7 0
+93.8 0
+93.9 0
+94 0
+94.1 0
+94.2 0
+94.3 0
+94.4 0
+94.5 0
+94.6 0
+94.7 0
+94.8 0
+94.9 0
+95 0
+95.1 0
+95.2 0
+95.3 0
+95.4 0
+95.5 0
+95.6 0
+95.7 0
+95.8 0
+95.9 0
+96 0
+96.1 0
+96.2 0
+96.3 0
+96.4 0
+96.5 0
+96.6 0
+96.7 0
+96.8 0
+96.9 0
+97 0
+97.1 0
+97.2 0
+97.3 0
+97.4 0
+97.5 0
+97.6 0
+97.7 0
+97.8 0
+97.9 0
+98 0
+98.1 0
+98.2 0
+98.3 0
+98.4 0
+98.5 0
+98.6 0
+98.7 0
+98.8 0
+98.9 0
+99 0
+99.1 0
+99.2 0
+99.3 0
+99.4 0
+99.5 0
+99.6 0
+99.7 0
+99.8 0
+99.9 0
+100 0
+100.1 0
+100.2 0
+100.3 0
+100.4 0
+100.5 0
+100.6 0
+100.7 0
+100.8 0
+100.9 0
+101 0
+101.1 0
+101.2 0
+101.3 0
+101.4 0
+101.5 0
+101.6 0
+101.7 0
+101.8 0
+101.9 0
+102 0
+102.1 0
+102.2 0
+102.3 0
+102.4 0
+102.5 0
+102.6 0
+102.7 0
+102.8 0
+102.9 0
+103 0
+103.1 0
+103.2 0
+103.3 0
+103.4 0
+103.5 0
+103.6 0
+103.7 0
+103.8 0
+103.9 0
+104 0
+104.1 0
+104.2 0
+104.3 0
+104.4 0
+104.5 0
+104.6 0
+104.7 0
+104.8 0
+104.9 0
+105 0
+105.1 0
+105.2 0
+105.3 0
+105.4 0
+105.5 0
+105.6 0
+105.7 0
+105.8 0
+105.9 0
+106 0
+106.1 0
+106.2 0
+106.3 0
+106.4 0
+106.5 0
+106.6 0
+106.7 0
+106.8 0
+106.9 0
+107 0
+107.1 0
+107.2 0
+107.3 0
+107.4 0
+107.5 0
+107.6 0
+107.7 0
+107.8 0
+107.9 0
+108 0
+108.1 0
+108.2 0
+108.3 0
+108.4 0
+108.5 0
+108.6 0
+108.7 0
+108.8 0
+108.9 0
+109 0
+109.1 0
+109.2 0
+109.3 0
+109.4 0
+109.5 0
+109.6 0
+109.7 0
+109.8 0
+109.9 0
+110 0
+110.1 0
+110.2 0
+110.3 0
+110.4 0
+110.5 0
+110.6 0
+110.7 0
+110.8 0
+110.9 0
+111 0
+111.1 0
+111.2 0
+111.3 0
+111.4 0
+111.5 0
+111.6 0
+111.7 0
+111.8 0
+111.9 0
+112 0
+112.1 0
+112.2 0
+112.3 0
+112.4 0
+112.5 0
+112.6 0
+112.7 0
+112.8 0
+112.9 0
+113 0
+113.1 0
+113.2 0
+113.3 0
+113.4 0
+113.5 0
+113.6 0
+113.7 0
+113.8 0
+113.9 0
+114 0
+114.1 0
+114.2 0
+114.3 0
+114.4 0
+114.5 0
+114.6 0
+114.7 0
+114.8 0
+114.9 0
+115 0
+115.1 0
+115.2 0
+115.3 0
+115.4 0
+115.5 0
+115.6 0
+115.7 0
+115.8 0
+115.9 0
+116 0
+116.1 0
+116.2 0
+116.3 0
+116.4 0
+116.5 0
+116.6 0
+116.7 0
+116.8 0
+116.9 0
+117 0
+117.1 0
+117.2 0
+117.3 0
+117.4 0
+117.5 0
+117.6 0
+117.7 0
+117.8 0
+117.9 0
+118 0
+118.1 0
+118.2 0
+118.3 0
+118.4 0
+118.5 0
+118.6 0
+118.7 0
+118.8 0
+118.9 0
+119 0
+119.1 0
+119.2 0
+119.3 0
+119.4 0
+119.5 0
+119.6 0
+119.7 0
+119.8 0
+119.9 0
+120 0
+120.1 0
+120.2 0
+120.3 0
+120.4 0
+120.5 0
+120.6 0
+120.7 0
+120.8 0
+120.9 0
+121 0
+121.1 0
+121.2 0
+121.3 0
+121.4 0
+121.5 0
+121.6 0
+121.7 0
+121.8 0
+121.9 0
+122 0
+122.1 0
+122.2 0
+122.3 0
+122.4 0
+122.5 0
+122.6 0
+122.7 0
+122.8 0
+122.9 0
+123 0
+123.1 0
+123.2 0
+123.3 0
+123.4 0
+123.5 0
+123.6 0
+123.7 0
+123.8 0
+123.9 0
+124 0
+124.1 0
+124.2 0
+124.3 0
+124.4 0
+124.5 0
+124.6 0
+124.7 0
+124.8 0
+124.9 0
+125 0
+125.1 0
+125.2 0
+125.3 0
+125.4 0
+125.5 0
+125.6 0
+125.7 0
+125.8 0
+125.9 0
+126 0
+126.1 0
+126.2 0
+126.3 0
+126.4 0
+126.5 0
+126.6 0
+126.7 0
+126.8 0
+126.9 0
+127 0
+127.1 0
+127.2 0
+127.3 0
+127.4 0
+127.5 0
+127.6 0
+127.7 0
+127.8 0
+127.9 0
+128 0
+128.1 0
+128.2 0
+128.3 0
+128.4 0
+128.5 0
+128.6 0
+128.7 0
+128.8 0
+128.9 0
+129 0
+129.1 0
+129.2 0
+129.3 0
+129.4 0
+129.5 0
+129.6 0
+129.7 0
+129.8 0
+129.9 0
+130 0
+130.1 0
+130.2 0
+130.3 0
+130.4 0
+130.5 0
+130.6 0
+130.7 0
+130.8 0
+130.9 0
+131 0
+131.1 0
+131.2 0
+131.3 0
+131.4 0
+131.5 0
+131.6 0
+131.7 0
+131.8 0
+131.9 0
+132 0
+132.1 0
+132.2 0
+132.3 0
+132.4 0
+132.5 0
+132.6 0
+132.7 0
+132.8 0
+132.9 0
+133 0
+133.1 0
+133.2 0
+133.3 0
+133.4 0
+133.5 0
+133.6 0
+133.7 0
+133.8 0
+133.9 0
+134 0
+134.1 0
+134.2 0
+134.3 0
+134.4 0
+134.5 0
+134.6 0
+134.7 0
+134.8 0
+134.9 0
+135 0
+135.1 0
+135.2 0
+135.3 0
+135.4 0
+135.5 0
+135.6 0
+135.7 0
+135.8 0
+135.9 0
+136 0
+136.1 0
+136.2 0
+136.3 0
+136.4 0
+136.5 0
+136.6 0
+136.7 0
+136.8 0
+136.9 0
+137 0
+137.1 0
+137.2 0
+137.3 0
+137.4 0
+137.5 0
+137.6 0
+137.7 0
+137.8 0
+137.9 0
+138 0
+138.1 0
+138.2 0
+138.3 0
+138.4 0
+138.5 0
+138.6 0
+138.7 0
+138.8 0
+138.9 0
+139 0
+139.1 0
+139.2 0
+139.3 0
+139.4 0
+139.5 0
+139.6 0
+139.7 0
+139.8 0
+139.9 0
+140 0
+140.1 0
+140.2 0
+140.3 0
+140.4 0
+140.5 0
+140.6 0
+140.7 0
+140.8 0
+140.9 0
+141 0
+141.1 0
+141.2 0
+141.3 0
+141.4 0
+141.5 0
+141.6 0
+141.7 0
+141.8 0
+141.9 0
+142 0
+142.1 0
+142.2 0
+142.3 0
+142.4 0
+142.5 0
+142.6 0
+142.7 0
+142.8 0
+142.9 0
+143 0
+143.1 0
+143.2 0
+143.3 0
+143.4 0
+143.5 0
+143.6 0
+143.7 0
+143.8 0
+143.9 0
+144 0
+144.1 0
+144.2 0
+144.3 0
+144.4 0
+144.5 0
+144.6 0
+144.7 0
+144.8 0
+144.9 0
+145 0
+145.1 0
+145.2 0
+145.3 0
+145.4 0
+145.5 0
+145.6 0
+145.7 0
+145.8 0
+145.9 0
+146 0
+146.1 0
+146.2 0
+146.3 0
+146.4 0
+146.5 0
+146.6 0
+146.7 0
+146.8 0
+146.9 0
+147 0
+147.1 0
+147.2 0
+147.3 0
+147.4 0
+147.5 0
+147.6 0
+147.7 0
+147.8 0
+147.9 0
+148 0
+148.1 0
+148.2 0
+148.3 0
+148.4 0
+148.5 0
+148.6 0
+148.7 0
+148.8 0
+148.9 0
+149 0
+149.1 0
+149.2 0
+149.3 0
+149.4 0
+149.5 0
+149.6 0
+149.7 0
+149.8 0
+149.9 0
+150 0
+150.1 0
+150.2 0
+150.3 0
+150.4 0
+150.5 0
+150.6 0
+150.7 0
+150.8 0
+150.9 0
+151 0
+151.1 0
+151.2 0
+151.3 0
+151.4 0
+151.5 0
+151.6 0
+151.7 0
+151.8 0
+151.9 0
+152 0
+152.1 0
+152.2 0
+152.3 0
+152.4 0
+152.5 0
+152.6 0
+152.7 0
+152.8 0
+152.9 0
+153 0
+153.1 0
+153.2 0
+153.3 0
+153.4 0
+153.5 0
+153.6 0
+153.7 0
+153.8 0
+153.9 0
+154 0
+154.1 0
+154.2 0
+154.3 0
+154.4 0
+154.5 0
+154.6 0
+154.7 0
+154.8 0
+154.9 0
+155 0
+155.1 0
+155.2 0
+155.3 0
+155.4 0
+155.5 0
+155.6 0
+155.7 0
+155.8 0
+155.9 0
+156 0
+156.1 0
+156.2 0
+156.3 0
+156.4 0
+156.5 0
+156.6 0
+156.7 0
+156.8 0
+156.9 0
+157 0
+157.1 0
+157.2 0
+157.3 0
+157.4 0
+157.5 0
+157.6 0
+157.7 0
+157.8 0
+157.9 0
+158 0
+158.1 0
+158.2 0
+158.3 0
+158.4 0
+158.5 0
+158.6 0
+158.7 0
+158.8 0
+158.9 0
+159 0
+159.1 0
+159.2 0
+159.3 0
+159.4 0
+159.5 0
+159.6 0
+159.7 0
+159.8 0
+159.9 0
+160 0
+160.1 0
+160.2 0
+160.3 0
+160.4 0
+160.5 0
+160.6 0
+160.7 0
+160.8 0
+160.9 0
+161 0
+161.1 0
+161.2 0
+161.3 0
+161.4 0
+161.5 0
+161.6 0
+161.7 0
+161.8 0
+161.9 0
+162 0
+162.1 0
+162.2 0
+162.3 0
+162.4 0
+162.5 0
+162.6 0
+162.7 0
+162.8 0
+162.9 0
+163 0
+163.1 0
+163.2 0
+163.3 0
+163.4 0
+163.5 0
+163.6 0
+163.7 0
+163.8 0
+163.9 0
+164 0
+164.1 0
+164.2 0
+164.3 0
+164.4 0
+164.5 0
+164.6 0
+164.7 0
+164.8 0
+164.9 0
+165 0
+165.1 0
+165.2 0
+165.3 0
+165.4 0
+165.5 0
+165.6 0
+165.7 0
+165.8 0
+165.9 0
+166 0
+166.1 0
+166.2 0
+166.3 0
+166.4 0
+166.5 0
+166.6 0
+166.7 0
+166.8 0
+166.9 0
+167 0
+167.1 0
+167.2 0
+167.3 0
+167.4 0
+167.5 0
+167.6 0
+167.7 0
+167.8 0
+167.9 0
+168 0
+168.1 0
+168.2 0
+168.3 0
+168.4 0
+168.5 0
+168.6 0
+168.7 0
+168.8 0
+168.9 0
+169 0
+169.1 0
+169.2 0
+169.3 0
+169.4 0
+169.5 0
+169.6 0
+169.7 0
+169.8 0
+169.9 0
+170 0
+170.1 0
+170.2 0
+170.3 0
+170.4 0
+170.5 0
+170.6 0
+170.7 0
+170.8 0
+170.9 0
+171 0
+171.1 0
+171.2 0
+171.3 0
+171.4 0
+171.5 0
+171.6 0
+171.7 0
+171.8 0
+171.9 0
+172 0
+172.1 0
+172.2 0
+172.3 0
+172.4 0
+172.5 0
+172.6 0
+172.7 0
+172.8 0
+172.9 0
+173 0
+173.1 0
+173.2 0
+173.3 0
+173.4 0
+173.5 0
+173.6 0
+173.7 0
+173.8 0
+173.9 0
+174 0
+174.1 0
+174.2 0
+174.3 0
+174.4 0
+174.5 0
+174.6 0
+174.7 0
+174.8 0
+174.9 0
+175 0
+175.1 0
+175.2 0
+175.3 0
+175.4 0
+175.5 0
+175.6 0
+175.7 0
+175.8 0
+175.9 0
+176 0
+176.1 0
+176.2 0
+176.3 0
+176.4 0
+176.5 0
+176.6 0
+176.7 0
+176.8 0
+176.9 0
+177 0
+177.1 0
+177.2 0
+177.3 0
+177.4 0
+177.5 0
+177.6 0
+177.7 0
+177.8 0
+177.9 0
+178 0
+178.1 0
+178.2 0
+178.3 0
+178.4 0
+178.5 0
+178.6 0
+178.7 0
+178.8 0
+178.9 0
+179 0
+179.1 0
+179.2 0
+179.3 0
+179.4 0
+179.5 0
+179.6 0
+179.7 0
+179.8 0
+179.9 0
+180 0
+180.1 0
diff --git a/Inputs/EventGenerator/sofia.reaction b/Inputs/EventGenerator/sofia.reaction
index 5769ba3f7c45f4c59c4757b156e4c6c7daa3fe84..109aae7dd696f9db5da5dce0fb2892a42ef71d06 100644
--- a/Inputs/EventGenerator/sofia.reaction
+++ b/Inputs/EventGenerator/sofia.reaction
@@ -4,29 +4,30 @@
%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad
Beam
Particle= 189Pb
- Energy= 166000
- SigmaEnergy= 2
- SigmaX= 11 mm
+ Energy= 122850
+ ExcitationEnergy= 0 MeV
+ SigmaEnergy= 0
+ SigmaX= 5 mm
SigmaY= 5 mm
SigmaThetaX= 0
SigmaPhiY= 0
MeanThetaX= 0
- MeanPhiY= 0.17 deg
- MeanX= 11 mm
- MeanY= -1.4 mm
+ MeanPhiY= 0 deg
+ MeanX= 0 mm
+ MeanY= -2 mm
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
TwoBodyReaction
Beam= 189Pb
Target= 208Pb
Light= 189Pb
Heavy= 208Pb
- ExcitationEnergyLight= 15.0
+ ExcitationEnergyLight= 25.0
ExcitationEnergyHeavy= 0.0
CrossSectionPath= sofia.txt CS
ShootLight= 1
ShootHeavy= 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%FissionDecay
+FissionDecay
CompoundNucleus= 189Pb
FissionModel= GEF
VamosChargeStates= 0
diff --git a/Inputs/EventGenerator/sofia_238U.reaction b/Inputs/EventGenerator/sofia_238U.reaction
index 64f4b000bb0238548425facbe3c602e982f2cbcb..91c30af903fde508f1955d75490d4f4e10e0eedf 100644
--- a/Inputs/EventGenerator/sofia_238U.reaction
+++ b/Inputs/EventGenerator/sofia_238U.reaction
@@ -12,9 +12,9 @@ Beam
SigmaThetaX= 0
SigmaPhiY= 0
MeanThetaX= 0
- MeanPhiY= 0.1 deg
- MeanX= -20.0 mm
- MeanY= -2.8 mm
+ MeanPhiY= 0 deg
+ MeanX= 0.0 mm
+ MeanY= 0.0 mm
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%TwoBodyReaction
Beam= 238U
diff --git a/NPSimulation/Detectors/Sofia/SofTofW.cc b/NPSimulation/Detectors/Sofia/SofTofW.cc
index 1607053412bb490641d777de314ded4b6344ae71..093a4eaa263d7cb31c441482d3a41600bd97a7a6 100644
--- a/NPSimulation/Detectors/Sofia/SofTofW.cc
+++ b/NPSimulation/Detectors/Sofia/SofTofW.cc
@@ -100,6 +100,7 @@ SofTofW::SofTofW(){
m_GLAD_MagField = 0;
m_GLAD_DistanceFromTarget= 0;
m_GLAD_TiltAngle= 7.;
+ m_GLAD_Yoffset= 0.;
// RGB Color + Transparency
m_VisSquare = new G4VisAttributes(G4Colour(0.53, 0.81, 0.98, 1));
@@ -272,6 +273,7 @@ void SofTofW::ReadConfiguration(NPL::InputParser parser){
double R = blocks[i]->GetDouble("R","mm");
double Theta = blocks[i]->GetDouble("Theta","deg");
double Phi = blocks[i]->GetDouble("Phi","deg");
+ m_GLAD_Yoffset = blocks[i]->GetDouble("Yoffset","mm");
m_Build_GLAD = blocks[i]->GetInt("Build_GLAD");
m_GLAD_TiltAngle = blocks[i]->GetDouble("GLAD_TiltAngle","deg");
m_Build_VacuumPipe = blocks[i]->GetInt("Build_VacuumPipe");
@@ -324,7 +326,7 @@ void SofTofW::ConstructDetector(G4LogicalVolume* world){
BuildTOFDetector()->MakeImprint(world,Det_pos,Rot);
}
- G4ThreeVector GLAD_pos = G4ThreeVector(0,0,m_GLAD_DistanceFromTarget);
+ G4ThreeVector GLAD_pos = G4ThreeVector(0,m_GLAD_Yoffset,m_GLAD_DistanceFromTarget);
if(m_Build_MagneticField==1){
BuildMagneticField()->MakeImprint(world,GLAD_pos,0);
}
diff --git a/NPSimulation/Detectors/Sofia/SofTofW.hh b/NPSimulation/Detectors/Sofia/SofTofW.hh
index ffc7f85e78c3218f1a8e603468f933aa353c3a0b..96311ddb20abf095f676938cbe416fdd3e2aac32 100644
--- a/NPSimulation/Detectors/Sofia/SofTofW.hh
+++ b/NPSimulation/Detectors/Sofia/SofTofW.hh
@@ -115,6 +115,7 @@ class SofTofW : public NPS::VDetector{
int m_Build_MagneticField;
double m_GLAD_MagField;
double m_GLAD_DistanceFromTarget;
+ double m_GLAD_Yoffset;
double m_GLAD_TiltAngle;
double m_VacuumPipeX;
double m_VacuumPipeY;
diff --git a/NPSimulation/Process/FissionDecay.cc b/NPSimulation/Process/FissionDecay.cc
index 45cd4a22d6bdf39fe9fa6a58a9acb1a187d62f10..e126a46cb95975954baa6d3bd92e00cc688cadeb 100644
--- a/NPSimulation/Process/FissionDecay.cc
+++ b/NPSimulation/Process/FissionDecay.cc
@@ -95,6 +95,7 @@ G4bool FissionDecay::IsApplicable( const G4ParticleDefinition& particleType) {
// Strip name from excitation energy
m_CurrentName = m_CurrentName.substr(0,m_CurrentName.find("["));
+
if (m_CompoundName==m_CurrentName) {
return true;
}
@@ -110,7 +111,7 @@ G4bool FissionDecay::ModelTrigger(const G4FastTrack& fastTrack) {
m_PreviousEnergy = PrimaryTrack->GetKineticEnergy();
m_FissionConditions->Clear();
- if(Parent_ID>=0){
+ if(Parent_ID>0){
Trigger = true;
}
diff --git a/Projects/ChiNu/Analysis.cxx b/Projects/ChiNu/Analysis.cxx
index 326cc0995188fa18dc6c987e7b471ab9e16d3609..fd75ddba706b2461bee8a86eb9cb8f4fa491f335 100644
--- a/Projects/ChiNu/Analysis.cxx
+++ b/Projects/ChiNu/Analysis.cxx
@@ -75,9 +75,9 @@ void Analysis::TreatEvent(){
Distance.push_back(R);
Det.push_back(m_ChiNu->DetectorNumber[i]);
T.push_back(m_ChiNu->Time[i]);
- double T_stop = m_ChiNu->Time[i]*1e-9;
+ double T_stop = (m_ChiNu->Time[i])*1e-9;
//neutron->SetTimeOfFlight((T_stop-beam_TOF)/(Rdet*1e-3));
- neutron->SetTimeOfFlight((T_stop)/(Rdet*1e-3));
+ neutron->SetTimeOfFlight((T_stop)/(Rdet*1e-3-8e-3));
E.push_back(m_ChiNu->Energy[i]);
Elab.push_back(neutron->GetEnergy());
diff --git a/Projects/Sofia/macro/ShowResultSimu.C b/Projects/Sofia/macro/ShowResultSimu.C
index 320e26a79ba59ed5610baa458a64684344045385..a2ccbf897a539d1772c46eee422e03bcd2d018e9 100644
--- a/Projects/Sofia/macro/ShowResultSimu.C
+++ b/Projects/Sofia/macro/ShowResultSimu.C
@@ -1,62 +1,66 @@
TChain* chain=NULL;
//////////////////////////////////////////////////////////////////
-void LoadRootFile(){
+void LoadRootFile(string nucleus){
chain = new TChain("SimulatedTree");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_1.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_2.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_3.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_4.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_5.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_6.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_7.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_8.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_9.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_10.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_11.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_12.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_13.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_14.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_15.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_16.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_17.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_18.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_19.root");
- chain->Add("../../../Outputs/Simulation/sofia_simu_glad_20.root");
+ string rootfilename = "../../../Outputs/Simulation/sofia_simu_" + nucleus + "_*";
+
+ chain->Add(rootfilename.c_str());
}
//////////////////////////////////////////////////////////////////
-void ShowResultSimu()
+void ShowResultSimu(string nucleus="182Hg")
{
- LoadRootFile();
+ LoadRootFile(nucleus);
+
+ gROOT->SetStyle("pierre_style");
- chain->Draw("fDetected_Position_Y:fDetected_Position_X>>hpos(200,-2100,-1100,200,-350,350)","fTOF_Energy@.size()==2","colz");
+ chain->Draw("fDetected_Position_Y:fDetected_Position_X>>hpos(200,-1900,-900,200,-400,400)","fTwim_AnodeNbr@.size()==32 && fTOF_Energy@.size()>=0","colz");
TH2F* hpos = (TH2F*)gDirectory->FindObjectAny("hpos");
+ hpos->GetXaxis()->SetTitle("X_{MWPC3} (mm)");
+ hpos->GetYaxis()->SetTitle("Y_{MWPC3} (mm)");
+ hpos->GetXaxis()->CenterTitle();
+ hpos->GetYaxis()->CenterTitle();
+
- chain->Draw("fFC_Fragment_Z>>h1(35,30,65)");
+ chain->Draw("fFC_Fragment_Z>>h1(45,20,65)");
TH1F* h1 = (TH1F*)gDirectory->FindObjectAny("h1");
+ h1->GetXaxis()->SetTitle("Simulated Charge Z");
+ h1->GetXaxis()->CenterTitle();
+
- chain->Draw("fDetected_Z>>h2(35,30,65)","fTOF_Energy@.size()==2");
+ //chain->Draw("fDetected_Z>>h2(40,25,65)","fTOF_Energy@.size()==2");
+ chain->Draw("fDetected_Z>>h2(45,20,65)","fTOF_Energy@.size()==2 && fTwim_AnodeNbr@.size()==32");
TH1F* h2 = (TH1F*)gDirectory->FindObjectAny("h2");
+ h2->GetXaxis()->SetTitle("Detected Charge Z");
+ h2->GetXaxis()->CenterTitle();
h1->Sumw2();
h2->Sumw2();
TH1F* hratio = (TH1F*)h2->Clone();
- hratio->Divide(h1);
+ hratio->Divide(h1);
+ hratio->GetXaxis()->SetTitle("Charge Z");
+ hratio->GetYaxis()->SetTitle("Detection efficiency");
+ hratio->GetXaxis()->CenterTitle();
+ hratio->GetYaxis()->CenterTitle();
- TCanvas* c1 = new TCanvas("c1","c1",1200,1200);
- c1->Divide(2,2);
+ TCanvas* c0 = new TCanvas("c0","c0",600,600);
+ TCanvas* c1 = new TCanvas("c1","c1",1800,600);
+ c1->Divide(3,1);
- c1->cd(1);
+ c0->cd();
hpos->Draw("colz");
- c1->cd(2);
+
+ c1->cd(1);
h1->Draw();
- c1->cd(3);
+ c1->cd(2);
h2->Draw();
- c1->cd(4);
+ c1->cd(3);
hratio->Draw("E1");
+ string histo_name = "./efficiency/eff_" + nucleus + ".root";
+ hratio->SaveAs(histo_name.c_str());
}
diff --git a/Projects/Sofia/sofia.detector b/Projects/Sofia/sofia.detector
index 7cc1d3e5d5692e869e575bb6ca3fbf0ff97cf7e0..36c9551bc5782ed58fd03b19d0376cdb35358eb6 100644
--- a/Projects/Sofia/sofia.detector
+++ b/Projects/Sofia/sofia.detector
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Target
- THICKNESS= 2 mm
+ THICKNESS= 3 mm
RADIUS= 100 mm
MATERIAL= Pb
ANGLE= 0 deg
@@ -9,14 +9,15 @@ Target
Z= 0 m
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
SofTofW
- R= 5 m
+ R= 4.5 m
THETA= -18 deg
PHI= 0 deg
+ Yoffset= 30.0 mm
Build_GLAD= 1
GLAD_TiltAngle= 14 deg
GLAD_DistanceFromTarget= 3.3 m
Build_MagneticField= 1
- GLAD_MagField= 1.80 T
+ GLAD_MagField= 1.75 T
Build_VacuumPipe= 1
VacuumPipeX= 0 cm
VacuumPipeY= 0 cm
diff --git a/Projects/s455/Analysis.cxx b/Projects/s455/Analysis.cxx
index 73467378c0001fb4c7d5e212630f29249d414aa6..efb950f10f929f369143b945ef53c642a7901929 100644
--- a/Projects/s455/Analysis.cxx
+++ b/Projects/s455/Analysis.cxx
@@ -54,6 +54,7 @@ struct TofPair
double x2twim = -1000;
double x2 = -1000;
double x3 = -1000;
+ double y3 = -1000;
double x3lab = 0;
double z3lab = 0;
};
@@ -252,9 +253,14 @@ void Analysis::FissionFragmentAnalysis(){
for(unsigned int k=0; k<X3.size(); k++){
double posx = X3[k];
+ double posy = -1000;
+ if(Y3.size()==X3.size())
+ posy = Y3[k];
if(abs(tofx-posx) < 150){
- if(abs(tofx-posx)<abs(tofx-TofHit[i].x3))
+ if(abs(tofx-posx)<abs(tofx-TofHit[i].x3)){
TofHit[i].x3 = posx;
+ TofHit[i].y3 = posy;
+ }
}
}
}
@@ -621,9 +627,11 @@ void Analysis::FissionFragmentAnalysis(){
m_GladField->SetCentralTheta(20.*deg);
m_GladField->SetX_MWPC3(-1.436*m);
m_GladField->SetZ_MWPC3(8.380*m);
-
- double Brho1 = m_GladField->FindBrho(InitPos[0], InitDir[0], FinalPos[0]);
- double Brho2 = m_GladField->FindBrho(InitPos[1], InitDir[1], FinalPos[1]);
+
+ double Brho1 = 0;
+ double Brho2 = 0;
+ //Brho1 = m_GladField->FindBrho(InitPos[0], InitDir[0], FinalPos[0]);
+ //Brho2 = m_GladField->FindBrho(InitPos[1], InitDir[1], FinalPos[1]);
Beta_Z1 = TofHit[0].beta;
Beta_Z2 = TofHit[1].beta;
@@ -650,8 +658,14 @@ void Analysis::FissionFragmentAnalysis(){
SofFF->SetPosX1(TofHit[1].x2twim);
SofFF->SetPosX2(TofHit[0].x2);
SofFF->SetPosX2(TofHit[1].x2);
- SofFF->SetPosX3(TofHit[0].x3lab);
- SofFF->SetPosX3(TofHit[1].x3lab);
+ SofFF->SetPosX3(TofHit[0].x3);
+ SofFF->SetPosX3(TofHit[1].x3);
+ SofFF->SetPosY3(TofHit[0].y3);
+ SofFF->SetPosY3(TofHit[1].y3);
+
+ //SofFF->SetPosX3(TofHit[0].x3lab);
+ //SofFF->SetPosX3(TofHit[1].x3lab);
+
SofFF->SetThetaIn(TofHit[0].theta_in);
SofFF->SetThetaIn(TofHit[1].theta_in);
@@ -807,7 +821,7 @@ void Analysis::InitParameter(){
fK_LS2 = -30e-8;
fBrho0 = 12.3255;
- fRunID = 5;
+ fRunID = 12;
// Beam parameter //
fZBeta_p0 = 1;
diff --git a/Projects/s455/RunToTreat.txt b/Projects/s455/RunToTreat.txt
index 12d77532d9964444403acbbceb4915ee3267c735..96e1b4884bedc4fb8ffeaf46974e7f539bd1bf8e 100644
--- a/Projects/s455/RunToTreat.txt
+++ b/Projects/s455/RunToTreat.txt
@@ -56,7 +56,7 @@ RootFileName
%% 187Pb
%/media/sofia/s455/raw/run_raw_0402.root
- /media/sofia/s455/raw/run_raw_0403.root
+ %/media/sofia/s455/raw/run_raw_0403.root
%% 184Hg
%/media/sofia/s455/raw/run_raw_0404.root
@@ -85,6 +85,6 @@ RootFileName
%/media/sofia/s455/raw/run_raw_0426.root
%% 197At
- %/media/sofia/s455/raw/run_raw_0427.root
- %/media/sofia/s455/raw/run_raw_0428.root
- %/media/sofia/s455/raw/run_raw_0429.root
+ /media/sofia/s455/raw/run_raw_0427.root
+ /media/sofia/s455/raw/run_raw_0428.root
+ /media/sofia/s455/raw/run_raw_0429.root
diff --git a/Projects/s455/calibration/SofSci/SofSci_physics.cal b/Projects/s455/calibration/SofSci/SofSci_physics.cal
index b5d5734487c506da72a4aeca02535cd84b096df9..8778ee911a3131c0216c0cc52ad439b9029ffaff 100644
--- a/Projects/s455/calibration/SofSci/SofSci_physics.cal
+++ b/Projects/s455/calibration/SofSci/SofSci_physics.cal
@@ -1,4 +1,4 @@
-SofSci_TOF2INV_V -8.04267 0.00737389
+SofSci_TOF2INV_V -8.0515 0.00737389
SofSci_LENGTH_S2 135.614
-SofSci_DET1_POSPAR 90 54.6
+SofSci_DET1_POSPAR 45.0 80.0
SofSci_DET2_POSPAR 943.287 86.652
diff --git a/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal b/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal
index 80e81ae3897bce71419200ca0b7240f56bc754df..37d3efaaa6803eb42745b0b186822b5f6513519a 100644
--- a/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal
+++ b/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal
@@ -1,3 +1,3 @@
-SofTrim_SEC1_ALIGN 14.3427 1.02007
+SofTrim_SEC1_ALIGN -457.863 1.03809
SofTrim_SEC2_ALIGN 0 1
-SofTrim_SEC3_ALIGN -2905.47 1.2027
+SofTrim_SEC3_ALIGN -2599.29 1.18757