Skip to content
Snippets Groups Projects
Commit e577cf44 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Fix view20

- Added NModules constants to "Hybrid" calorimeter.
parent 56af20f6
No related branches found
No related tags found
1 merge request!181Fix view20
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
Beamline elements Beamline elements
----------------- -----------------
</comment> </comment>
<include ref="ip6/beampipe.xml" />
<documentation level="5"> <documentation level="5">
## Main magnet ## Main magnet
......
1.34392e+07 1.34392e+07
0 90
180 180
0 0
0 0
0 0
0 0
5 1
3 1
0.001 0.001
0 0
1 1
......
...@@ -68,13 +68,18 @@ pdftoppm ${FILE_TAG}.pdf ${FILE_TAG} -png -singlefile -cropbox -thinlinemode sol ...@@ -68,13 +68,18 @@ pdftoppm ${FILE_TAG}.pdf ${FILE_TAG} -png -singlefile -cropbox -thinlinemode sol
#npdet_info print EcalEndcapN_z0 --value-only ../../athena.xml #npdet_info print EcalEndcapN_z0 --value-only ../../athena.xml
#180.5 cm #180.5 cm
NMOD1=`npdet_info print EcalEndcapN_NModules_Sector1 ${DETECTOR_PATH}/calorimeters.xml | tail -1` zcut=$(npdet_info print EcalEndcapN_z0 --value-only ${DETECTOR_PATH}/athena.xml )
NMOD2=`npdet_info print EcalEndcapN_NModules_Sector2 ${DETECTOR_PATH}/calorimeters.xml | tail -1` NMOD1=$(npdet_info print EcalEndcapN_NModules_Sector1 --value-only ${DETECTOR_PATH}/calorimeters.xml )
NMOD2=$(npdet_info print EcalEndcapN_NModules_Sector2 --value-only ${DETECTOR_PATH}/calorimeters.xml )
echo "NMOD1 = ${NMOD1}"
echo "NMOD2 = ${NMOD2}"
echo "zcut = ${zcut}"
# Top view with a thin slice down the middle # Top view with a thin slice down the middle
dawncut 0 0 1 -1800 ${INPUT_FILE} ${FILE_TAG}_endcapN_temp0.prim dawncut 0 0 1 -1800 ${INPUT_FILE} ${FILE_TAG}_endcapN_temp0.prim
dawncut 0 0 -1 1805 ${FILE_TAG}_endcapN_temp0.prim ${FILE_TAG}_endcapN.prim dawncut 0 0 -1 2200 ${FILE_TAG}_endcapN_temp0.prim ${FILE_TAG}_endcapN.prim
../../bin/dawn_tweak --mag 5 --draw 1 --theta 180 --phi 0 --draw 3 ../../bin/dawn_tweak --mag 5 --draw 3 --theta 180 --phi 0
dawn -d ${FILE_TAG}_endcapN.prim dawn -d ${FILE_TAG}_endcapN.prim
ps2pdf ${FILE_TAG}_endcapN.eps ${FILE_TAG}_endcapN_full.pdf ps2pdf ${FILE_TAG}_endcapN.eps ${FILE_TAG}_endcapN_full.pdf
gs -o ${FILE_TAG}_endcapN.pdf -sDEVICE=pdfwrite \ gs -o ${FILE_TAG}_endcapN.pdf -sDEVICE=pdfwrite \
......
...@@ -215,10 +215,13 @@ static Ref_t create_detector(Detector& desc, xml::Handle_t handle, SensitiveDete ...@@ -215,10 +215,13 @@ static Ref_t create_detector(Detector& desc, xml::Handle_t handle, SensitiveDete
// fmt::print(" {:<5} {:<6} {:<3} {:<3} {:>10.4f} {:>10.4f} {}\n", towerIndex, code, colIndex, rowIndex, x / cm, y / cm, name); // fmt::print(" {:<5} {:<6} {:<3} {:<3} {:>10.4f} {:>10.4f} {}\n", towerIndex, code, colIndex, rowIndex, x / cm, y / cm, name);
glass_module_index++; //glass_module_index++;
} }
} }
} }
desc.add(Constant("EcalEndcapN_NModules_Sector1", std::to_string(cryst_module_index)));
desc.add(Constant("EcalEndcapN_NModules_Sector2", std::to_string(glass_module_index)));
// fmt::print("Total Glass modules: {}\n", towerIndex); // fmt::print("Total Glass modules: {}\n", towerIndex);
// fmt::print("CE EMCAL GLASS END\n\n"); // fmt::print("CE EMCAL GLASS END\n\n");
......
...@@ -36,3 +36,31 @@ view_prim:ev004: ...@@ -36,3 +36,31 @@ view_prim:ev004:
- if: '$DETECTOR_EVENT_VIEWS == "ON"' - if: '$DETECTOR_EVENT_VIEWS == "ON"'
script: script:
- ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev004 -s 4 - ./bin/generate_prim_file -o ${LOCAL_DATA_PATH} -t view_ev004 -s 4
view_prim:calorimeters:
extends: .views
stage: test
script:
- cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
- ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -D -t calorimeters_view
- ls -lrth && ls -lrth ${LOCAL_DATA_PATH}
view_prim:calorimeters_ev001:
extends: .views
stage: test
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
- ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev001 -s 1
view_prim:calorimeters_ev002:
extends: .views
stage: test
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
- ./bin/generate_prim_file -c ${DETECTOR_PATH}/calorimeters.xml -o ${LOCAL_DATA_PATH} -t calorimeters_view_ev002 -s 2
dawn_view_20:detector: dawn_view_20:detector:
extends: .views extends: .views
needs: needs:
- job: view_prim:detector_only - job: view_prim:calorimeters
optional: false optional: false
script: script:
- cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/." - cp "compact/subsystem_views/calorimeters.xml" "${DETECTOR_PATH}/."
- ./bin/make_dawn_views -c ${DETECTOR_PATH}/calorimeters.xml -i ${LOCAL_DATA_PATH}/detector_view.prim -t calorimeters_view20 -d scripts/view20 -D - ./bin/make_dawn_views -c ${DETECTOR_PATH}/calorimeters.xml -i ${LOCAL_DATA_PATH}/calorimeters_view.prim -t view20 -d scripts/view20 -D
dawn_view_20:ev001: dawn_view_20:ev001:
extends: .views extends: .views
needs: needs:
- job: view_prim:ev001 - job: view_prim:calorimeters_ev001
optional: true optional: true
rules: rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"' - if: '$DETECTOR_EVENT_VIEWS == "ON"'
script: script:
- ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev001.prim -t view20_ev001 -d scripts/view20 -s 1 - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/calorimeters_view_ev001.prim -t view20_ev001 -d scripts/view20 -s 1
dawn_view_20:ev002: dawn_view_20:ev002:
extends: .views extends: .views
needs: needs:
- job: view_prim:ev002 - job: view_prim:calorimeters_ev002
optional: true optional: true
rules: rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"' - if: '$DETECTOR_EVENT_VIEWS == "ON"'
script: script:
- ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/view_ev002.prim -t view20_ev002 -d scripts/view20 -s 2 - ./bin/make_dawn_views -i ${LOCAL_DATA_PATH}/calorimeters_view_ev002.prim -t view20_ev002 -d scripts/view20 -s 2
view_20: view_20:
stage: collect stage: collect
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment