diff --git a/compact/subsystem_views/calorimeters.xml b/compact/subsystem_views/calorimeters.xml
index 57df8740f7fe218817cfdc85efcdc01708fa51b9..49799815aa6fac00e8ea9d0c14390d4150cd12ab 100644
--- a/compact/subsystem_views/calorimeters.xml
+++ b/compact/subsystem_views/calorimeters.xml
@@ -87,6 +87,7 @@
Beamline elements
-----------------
</comment>
+ <include ref="ip6/beampipe.xml" />
<documentation level="5">
## Main magnet
diff --git a/scripts/view20/.DAWN_1.history b/scripts/view20/.DAWN_1.history
index cc3ead27e270274b093988f7eda5bba798365496..f4980ff8cd6dd972e1cba46f982d708156c32e73 100644
--- a/scripts/view20/.DAWN_1.history
+++ b/scripts/view20/.DAWN_1.history
@@ -1,12 +1,12 @@
1.34392e+07
-0
+90
180
0
0
0
0
-5
-3
+1
+1
0.001
0
1
diff --git a/scripts/view20/generate_eps b/scripts/view20/generate_eps
index 8700144858a0ac7f7080e591fbcb4eb6586e8d6d..8a5365d4e28e3be53885fa2550f1959379c3453e 100755
--- a/scripts/view20/generate_eps
+++ b/scripts/view20/generate_eps
@@ -68,13 +68,18 @@ pdftoppm ${FILE_TAG}.pdf ${FILE_TAG} -png -singlefile -cropbox -thinlinemode sol
#npdet_info print EcalEndcapN_z0 --value-only ../../athena.xml
#180.5 cm
-NMOD1=`npdet_info print EcalEndcapN_NModules_Sector1 ${DETECTOR_PATH}/calorimeters.xml | tail -1`
-NMOD2=`npdet_info print EcalEndcapN_NModules_Sector2 ${DETECTOR_PATH}/calorimeters.xml | tail -1`
+zcut=$(npdet_info print EcalEndcapN_z0 --value-only ${DETECTOR_PATH}/athena.xml )
+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
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
-../../bin/dawn_tweak --mag 5 --draw 1 --theta 180 --phi 0 --draw 3
+dawncut 0 0 -1 2200 ${FILE_TAG}_endcapN_temp0.prim ${FILE_TAG}_endcapN.prim
+../../bin/dawn_tweak --mag 5 --draw 3 --theta 180 --phi 0
dawn -d ${FILE_TAG}_endcapN.prim
ps2pdf ${FILE_TAG}_endcapN.eps ${FILE_TAG}_endcapN_full.pdf
gs -o ${FILE_TAG}_endcapN.pdf -sDEVICE=pdfwrite \
diff --git a/src/HybridCalorimeter_geo.cpp b/src/HybridCalorimeter_geo.cpp
index e0a86b7ef5d6346af5e44d8428a10a59c1e8edba..20f4a38c9530c0d7c95ca5d42b2113898b6c6f35 100644
--- a/src/HybridCalorimeter_geo.cpp
+++ b/src/HybridCalorimeter_geo.cpp
@@ -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);
- 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("CE EMCAL GLASS END\n\n");
diff --git a/views/generate_prim_files.yml b/views/generate_prim_files.yml
index e511aa2300f192a1d377b58fef41a2c01997a900..69c25d3fe7290a2ef778eecc5431bba0707d1a68 100644
--- a/views/generate_prim_files.yml
+++ b/views/generate_prim_files.yml
@@ -36,3 +36,31 @@ view_prim:ev004:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
script:
- ./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
+
diff --git a/views/view20.yml b/views/view20.yml
index be4107e9273a71a7edffacfbcf82955aa7e4fa4f..ba01b249a6781371f72c6a3c5e20648da7ce57a5 100644
--- a/views/view20.yml
+++ b/views/view20.yml
@@ -1,31 +1,31 @@
dawn_view_20:detector:
extends: .views
needs:
- - job: view_prim:detector_only
+ - job: view_prim:calorimeters
optional: false
script:
- 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:
extends: .views
needs:
- - job: view_prim:ev001
+ - job: view_prim:calorimeters_ev001
optional: true
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
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:
extends: .views
needs:
- - job: view_prim:ev002
+ - job: view_prim:calorimeters_ev002
optional: true
rules:
- if: '$DETECTOR_EVENT_VIEWS == "ON"'
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:
stage: collect