Commit aa7d7fc8 authored by andreasgad's avatar andreasgad
Browse files

added another test

parent 35e2ca91
#!/usr/bin/env bash
rm -r build
mkdir build
cd build
cmake ..
make -j8
cd ..
run=3158
#scp andreas@stkernfys.phys.au.dk:/Experiments/IFA/IFA034/unpacked_data/${run}_000.root data/unpacked/.
SETUP="setup/setup_2021.json"
echo "Sorting run : $run using $SETUP"
FILES="data/unpacked/${run}_*"
echo "$FILES"
#~/tools/sorter/build/Sorter -s $SETUP -m setup/matcher.json -o data/sorted/ $FILES
cd build/bin
./Be8analysis $run
2975 1026
3158 2000
2976 1026
2977 1879
2978 1879
......@@ -43,4 +44,5 @@
3093 2000
3094 2500
3095 2500
3096 3000
\ No newline at end of file
3096 3000
3158 2000
......@@ -263,7 +263,7 @@ public:
for (size_t i = 2-add; i < output.dssdCount(); i++) { //Does this mean that we only have two detectors to look at?? I think so...
auto& o = output.getDssdOutput(i);
auto& p = output.getSingleOutput(i-2+add);
// auto& p = output.getSingleOutput(i-2+add);
auto& d = o.detector();
auto m = AUSA::mul(o);
......@@ -277,7 +277,8 @@ public:
auto eDssd = energy(o,j);
auto ePad = p.energy(0);
//auto ePad = p.energy(0);
auto ePad = 0;
if(i+add<2) ePad = 0;
......@@ -527,7 +528,7 @@ public:
map<int, double> readMap() {
map<int, double> map;
string line;
ifstream infile("/home/andreasgad/tools/IFA030/analysis/energy_map");
ifstream infile("/home/andreasgad/IFA030/analysis/energy_map");
while (getline(infile, line))
{
istringstream iss(line);
......@@ -535,6 +536,7 @@ map<int, double> readMap() {
double E;
if (!(iss >> run >> E)) { throw runtime_error("Error parsing energy map!"); } // error
map[run] = E;
cout << run << ", " << E << endl;
}
return map;
}
......@@ -603,6 +605,8 @@ int main(int argc, char* argv[]) {
auto setup = JSON::readSetupFromJSON(relPath+"setup/setup.json");
if(run>3150) setup = JSON::readSetupFromJSON(relPath+"setup/setup_2021.json");
auto target = JSON::readTargetFromJSON(relPath+"setup/targets/target.json");
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# AUSAlib version: 16.6-773-g77e94584
# Calibrator version: 16.6-94-ga4043ab
# Calibrator arguments: ./Calibrator -s /home/christiane/bachelor/data/2000/Setup/setup.json -k /home/christiane/tools/ausalib/res/Sources/AU3a.json -d Det1 -r 3 --eloss --gui -o /home/christiane/bachelor/data/2000/Setup/Calibrated/
# Input files:
# /home/christiane/bachelor/data/2000/Setup/Data_cal/3146_000.root
# Calibration of Det1
# Performed @ 2021-03-26 09:44
# Performed by christiane on christiane-VirtualBox
# Front
-665.37 4.1477
-651.632 4.12302
-565.127 4.10148
-646.261 4.21807
-576.646 4.12123
-573.572 4.19732
-724.209 4.15736
-677.822 4.14083
-738.814 4.11318
-635.459 4.16157
-692.605 4.2617
-589.367 4.16616
-605.121 4.20847
-659.676 4.20045
-620.794 4.22948
-601.499 4.27104
# Back
-510.067 3.80952
-497.301 3.74817
-566.653 3.71046
-466.486 3.65834
-584.784 3.70364
-411.124 3.66625
-614.167 3.7617
-614.343 3.73322
-555.166 3.73899
-645.167 3.73347
-500.254 3.78318
-588.978 3.74962
-649.728 3.89741
-583.018 3.74029
-551.738 3.72394
-513.161 3.8447
# AUSAlib version: 16.6-773-g77e94584
# Calibrator version: 16.6-94-ga4043ab
# Calibrator arguments: ./Calibrator -s /home/christiane/bachelor/data/2000/Setup/setup.json -k /home/christiane/tools/ausalib/res/Sources/AU3a.json -d Det2 -r 3 --eloss --gui -o /home/christiane/bachelor/data/2000/Setup/Calibrated/
# Input files:
# /home/christiane/bachelor/data/2000/Setup/Data_cal/3140_000.root
# Calibration of Det2
# Performed @ 2021-03-26 10:37
# Performed by christiane on christiane-VirtualBox
# Front
-543.192 4.06692
-351.918 4.04459
-473.98 4.07004
-370.566 4.02396
-415.673 3.95332
-420.663 4.04375
-390.475 3.99512
-336.035 3.95978
-423.415 3.98323
-385.673 4.00099
-361.004 3.96293
-366.628 4.02305
-306.773 4.00538
-393.217 4.00693
-360.685 4.02044
-346.094 4.22643
# Back
-265.795 3.71079
-287.388 3.63386
-403.712 3.70381
-385.124 3.69337
-325.868 3.69427
-341.723 3.68926
-368.481 3.62767
-388.053 3.64397
-378.948 3.66746
-414.22 3.6274
-442.588 3.67265
-372.663 3.67312
-467.27 3.68421
-396.903 3.72133
-462.186 3.71855
-387.168 3.65319
# AUSAlib version: 16.6-692-ga589915e-dirty
# Calibrator version: 16.6-93-gaef47da
# Calibrator arguments: /home/andreas/tools/Calibrator/build/Calibrator -s setup/setup.json -k /home/andreas/IFA029/setup/old_source.json -o setup/ADC_test/ -d Pad1 -r 0.8 --gui
# Input files:
# data/unpacked/calibrationdata/2974_000.root
# data/unpacked/calibrationdata/2974_001.root
# data/unpacked/calibrationdata/2974_002.root
# data/unpacked/calibrationdata/2974_003.root
# data/unpacked/calibrationdata/2974_004.root
# data/unpacked/calibrationdata/2974_005.root
# Calibration of Pad1
# Performed @ 2019-05-01 14:54
# Performed by andreas on squamish
# SSD
-218.209 3.20206
# AUSAlib version: 16.6-692-ga589915e-dirty
# Calibrator version: 16.6-93-gaef47da
# Calibrator arguments: /home/andreas/tools/Calibrator/build/Calibrator -s setup/setup_pad.json -k setup/old_source_simple.json -o setup/ADC_test/ -d Pad2 -r 0.8 --gui
# Input files:
# setup/ADC_test/2973_000_raw_specs.root
# Calibration of Pad2
# Performed @ 2019-05-01 15:06
# Performed by andreas on squamish
# SSD
-245.534 3.0539
# AUSAlib version: 16.6-692-ga589915e-dirty
# Calibrator version: 16.6-93-gaef47da
# Calibrator arguments: /home/andreas/tools/Calibrator/build/Calibrator -s setup/setup_geocali.json -k /home/andreas/tools/ausalib/res/Sources/AU3a.json -o setup/ADC_test/ -d SD --eloss --gui
# Input files:
# data/unpacked/calibrationdata/2971_000.root
# data/unpacked/calibrationdata/2971_001.root
# Calibration of SD
# Performed @ 2019-04-25 09:46
# Performed by andreas on squamish
# Front
# Slope or offset was either NaN or Inf and has been set to 0.0!
0.0 0.0
# Slope or offset was either NaN or Inf and has been set to 0.0!
0.0 0.0
2953.42 1.89416
-87.1541 2.78557
-130.497 3.11777
-143.585 3.01653
-198.75 3.19711
-184.826 3.09766
-226.287 3.12738
-111.099 3.2437
-229.953 3.13992
-133.555 3.0018
-184.402 3.18413
-132.888 3.04712
-206.636 3.23107
-160.83 3.08017
-117.729 3.02758
-66.3722 3.23453
-175.851 3.23087
-171.237 3.04953
-179.661 3.1192
-209.936 3.3336
-256.965 3.13634
-110.477 3.08044
-272.424 3.23528
-173.157 3.36035
-225.392 3.18965
-183.973 2.94295
-255.438 3.17338
-210.752 3.22397
-180.79 2.97012
-177.9 3.08622
# Back
-251.014 2.96865
-260.498 2.97594
-245.215 2.6931
-210.898 2.90388
-220.783 2.88335
-212.425 3.07198
-266.879 2.92266
-214.403 2.82364
-287.145 2.92845
-264.955 3.0783
-319.648 2.93897
-260.439 2.58778
-388.579 2.89992
-325.896 3.00625
-355.123 2.93995
-337.38 2.89694
-146.353 2.93151
-122.672 2.91906
-159.115 2.84553
-121.997 2.68654
-172.244 2.84803
-119.941 2.97763
-112.842 2.96977
-152.692 2.87112
# AUSAlib version: 16.6-692-ga589915e-dirty
# Calibrator version: 16.6-93-gaef47da
# Calibrator arguments: /home/andreas/tools/Calibrator/build/Calibrator -s setup/setup_geocali.json -k /home/andreas/tools/ausalib/res/Sources/AU3a.json -o setup/ADC_test/ -d SU --eloss --gui
# Input files:
# data/unpacked/calibrationdata/2969_000.root
# Calibration of SU
# Performed @ 2019-04-25 09:46
# Performed by andreas on squamish
# Front
-394.201 3.17112
-360.874 3.25589
-405.806 3.24668
-386.926 3.09295
-427.662 3.15642
-332.807 3.17809
-410.251 3.13281
-334.324 3.03489
-345.999 3.12686
-422.641 3.10116
-429.588 3.2218
-394.114 2.89954
-459.312 3.02999
-393.522 3.0748
-443.868 3.13696
-329.133 2.92014
-460.274 3.11815
-436.987 3.24524
-457.367 3.04884
-433.041 3.04652
-412.699 3.14313
-411.003 3.20296
-539.556 3.36626
-312.672 2.85553
-522.024 3.12374
-333.276 2.97317
-517.607 3.1389
-391.882 3.09235
-483.165 3.19704
-460.681 3.35686
-481.342 3.17484
-494.598 3.01139
# Back
-142.744 2.81783
-76.5608 2.84885
-126.885 2.813
-125.133 2.79437
-107.88 2.72529
-181.733 2.87109
-118.063 2.78027
-72.0536 2.76273
-137.164 2.76583
-160.905 2.76737
-190.356 2.88105
-148.252 2.61643
-157.318 2.52458
-126.381 2.88108
-134.353 2.85127
-177.881 2.80541
-214.134 2.80861
-90.4174 2.81072
-171.434 2.98168
-195.454 2.80308
-187.886 2.71669
-164.108 2.77609
-232.199 2.98366
-166.08 2.76505
{
"name": "Na23",
"detectors": [
{
"name": "SU",
"file": "AUS3_322_00.json",
"calibration": "ADC/SU.cal",
"position": {
"x": "1.30374mm",
"y": "1.16484mm",
"z": "-36.3483mm"
},
"normal": {
"x": "0.0mm",
"y": "0.0mm",
"z": "1.0mm"
},
"orientation": {
"x": "1.0mm",
"y": "0.0mm",
"z": "0.0mm"
},
"frontMapping": {
"prefix": "SU_S",
"multiplicity": "",
"segment": "I",
"adc": "_E",
"tdc": "-DEAD-"
},
"backMapping": {
"prefix": "SU_R",
"multiplicity": "",
"segment": "I",
"adc": "_E",
"tdc": "_T"
}
},
{
"name": "SD",
"file": "AUS3_1000_00.json",
"calibration": "ADC/SD.cal",
"position": {
"x": "1.04193mm",
"y": "0.589054mm",
"z": "37.4565mm"
},
"normal": {
"x": "0mm",
"y": "0mm",
"z": "-1mm"
},
"orientation": {
"x": "-1.0mm",
"y": "0.0mm",
"z": "0.0mm"
},
"frontMapping": {
"prefix": "SD_S",
"multiplicity": "",
"segment": "I",
"adc": "_E",
"tdc": "-DEAD-"
},
"backMapping": {
"prefix": "SD_R",
"multiplicity": "",
"segment": "I",
"adc": "_E",
"tdc": "_T"
}
},
{
"name": "Det1",
"file": "AUW1_60_00.json",
"calibration": "ADC_2021/Det1.cal",
"position": {
"x": "35.65mm",
"y": "-1.0mm",
"z": "-2.2mm"
},
"normal": {
"r": "1mm",
"theta": "90deg",
"phi": "180.0deg"
},
"orientation": {
"x": "0 mm",
"y": "1 mm",
"z": "0 mm"
},
"frontMapping": {
"tdc": "_T",
"multiplicity": "",
"prefix": "DET1F",
"segment": "I",
"adc": "_E"
},
"backMapping": {
"tdc": "_T",
"multiplicity": "",
"prefix": "DET1B",
"segment": "I",
"adc": "_E"
}
},
{
"name": "Det2",
"file": "AUW1_60_00.json",
"calibration": "ADC_2021/Det2.cal",
"position": {
"x": "-38mm",
"y": "-1.6mm",
"z": "-2.2mm"
},
"normal": {
"r": "1mm",
"theta": "90deg",
"phi": "0.0deg"
},
"orientation": {
"x": "0 mm",
"y": "1 mm",
"z": "0 mm"
},
"frontMapping": {
"tdc": "_T",
"multiplicity": "",
"prefix": "DET2F",
"segment": "I",
"adc": "_E"
},
"backMapping": {
"tdc": "_T",
"multiplicity": "",
"prefix": "DET2B",
"segment": "I",
"adc": "_E"
}
},
{
"name": "Pad1",
"file": "AUPAD_1458_00.json",
"calibration": "ADC_pad/Pad1.cal",
"position": {
"x": "43mm",
"y": "0.0mm",
"z": "0.0mm"
},
"normal": {
"r": "1mm",
"theta": "90deg",
"phi": "180.0deg"
},
"orientation": {
"x": "0 mm",
"y": "1 mm",
"z": "0 mm"
},
"mapping": {
"adc": "PAD1E",
"tdc": "-DEAD-"
}
},
{
"name": "Pad2",
"file": "AUPAD_1458_00.json",
"calibration": "ADC_pad/Pad2.cal",
"position": {
"x": "-43mm",
"y": "0.0mm",
"z": "0.0mm"
},
"normal": {
"r": "1mm",
"theta": "90deg",
"phi": "0.0deg"
},
"orientation": {
"x": "0 mm",
"y": "1 mm",
"z": "0 mm"
},
"mapping": {
"adc": "HPGe_E",
"tdc": "-DEAD-"
}
}
],
"telescopes": [
{
"front": "Det1",
"dn": "3mm",
"back": "Pad1"
},
{
"front": "Det2",
"dn": "3mm",
"back": "Pad2"
}
],
"signals": [
"CLOCK",
"VCHARGE"
]
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment