From 94ef28986fe9a323414d42ba5d2075b14bb747f6 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sat, 27 Feb 2021 12:16:23 -0800
Subject: [PATCH] Fix obsolete indexing, add IFD forward compatibility
---
.../VTI12RawDataSystems/VP1RawDataFlags.h | 3 ++-
.../src/VP1RawDataHandle_SCT_RDO.cxx | 14 +++++++------
.../src/VP1RawDataSysController.cxx | 5 +++++
.../src/rawdata_settings_cuts_form.ui | 20 ++++++++++++++-----
4 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/VTI12RawDataSystems/VP1RawDataFlags.h b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/VTI12RawDataSystems/VP1RawDataFlags.h
index aa702697..60d55271 100644
--- a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/VTI12RawDataSystems/VP1RawDataFlags.h
+++ b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/VTI12RawDataSystems/VP1RawDataFlags.h
@@ -25,7 +25,8 @@ public:
Upstream = 0x000001,
Central = 0x000002,
Downstream = 0x000004,
- All = 0x000007
+ Interface = 0x000008,
+ All = 0x00000F
};
Q_DECLARE_FLAGS(TrackerPartsFlags, TrackerPartsFlag)
diff --git a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataHandle_SCT_RDO.cxx b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataHandle_SCT_RDO.cxx
index 9cbf757e..8f7669a4 100644
--- a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataHandle_SCT_RDO.cxx
+++ b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataHandle_SCT_RDO.cxx
@@ -53,9 +53,10 @@ QStringList VP1RawDataHandle_SCT_RDO::clicked(bool verbose) const
if (verbose) {
if (idhelper) {
Identifier id(m_data->identify());
- if (idhelper->station(id) == -1 ) l << " Part: Upstream Station";
- else if (idhelper->station(id) == 0) l << " Part: Central Station";
- else l << " Part: Downstream Station";
+ if (idhelper->station(id) == 0 ) l << " Part: Interface Station";
+ else if (idhelper->station(id) == 1 ) l << " Part: Upstream Station";
+ else if (idhelper->station(id) == 2 ) l << " Part: Central Station";
+ else l << " Part: Downstream Station";
// bool barrel(false);
// if (idhelper->barrel_ec(id)==-2) l << " Part: End Cap C";
// else if (idhelper->barrel_ec(id)==2) l << " Part: End Cap A";
@@ -140,9 +141,10 @@ VP1RawDataFlags::TrackerPartsFlags VP1RawDataHandle_SCT_RDO::inTrackerParts() co
static const FaserSCT_ID * idhelper = VP1DetInfo::sctIDHelper();
Identifier id(m_data->identify());
- if (idhelper->station(id) == -1 ) return VP1RawDataFlags::Upstream;
- if (idhelper->station(id) == 0 ) return VP1RawDataFlags::Central;
- if (idhelper->station(id) == 1 ) return VP1RawDataFlags::Downstream;
+ if (idhelper->station(id) == 0 ) return VP1RawDataFlags::Interface;
+ if (idhelper->station(id) == 1 ) return VP1RawDataFlags::Upstream;
+ if (idhelper->station(id) == 2 ) return VP1RawDataFlags::Central;
+ if (idhelper->station(id) == 3 ) return VP1RawDataFlags::Downstream;
return VP1RawDataFlags::All;
}
diff --git a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataSysController.cxx b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataSysController.cxx
index 341035c6..d2f1ab3b 100644
--- a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataSysController.cxx
+++ b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/VP1RawDataSysController.cxx
@@ -97,6 +97,7 @@ VP1RawDataSysController::VP1RawDataSysController(IVP1System * sys)
// -> enabledTrackerParts
addUpdateSlot(SLOT(possibleChange_enabledTrackerParts()));
+ connectToLastUpdateSlot(m_d->ui_cuts.checkBox_cut_tracker_interface);
connectToLastUpdateSlot(m_d->ui_cuts.checkBox_cut_tracker_upstream);
connectToLastUpdateSlot(m_d->ui_cuts.checkBox_cut_tracker_central);
connectToLastUpdateSlot(m_d->ui_cuts.checkBox_cut_tracker_downstream);
@@ -137,6 +138,7 @@ int VP1RawDataSysController::currentSettingsVersion() const
void VP1RawDataSysController::actualSaveSettings(VP1Serialise&s) const
{
s.save(m_d->ui_cuts.etaPhiCutWidget);
+ s.save(m_d->ui_cuts.checkBox_cut_tracker_interface);
s.save(m_d->ui_cuts.checkBox_cut_tracker_upstream);
s.save(m_d->ui_cuts.checkBox_cut_tracker_central);
s.save(m_d->ui_cuts.checkBox_cut_tracker_downstream);
@@ -166,6 +168,7 @@ void VP1RawDataSysController::actualRestoreSettings(VP1Deserialise& s)
return;
}
s.restore(m_d->ui_cuts.etaPhiCutWidget);
+ s.restore(m_d->ui_cuts.checkBox_cut_tracker_interface);
s.restore(m_d->ui_cuts.checkBox_cut_tracker_upstream);
s.restore(m_d->ui_cuts.checkBox_cut_tracker_central);
s.restore(m_d->ui_cuts.checkBox_cut_tracker_downstream);
@@ -239,6 +242,8 @@ bool VP1RawDataSysController::showVolumeOutLines() const
VP1RawDataFlags::TrackerPartsFlags VP1RawDataSysController::enabledTrackerParts() const
{
VP1RawDataFlags::TrackerPartsFlags f;
+ if (m_d->ui_cuts.checkBox_cut_tracker_interface->isChecked())
+ f |= VP1RawDataFlags::Interface;
if (m_d->ui_cuts.checkBox_cut_tracker_upstream->isChecked())
f |= VP1RawDataFlags::Upstream;
if (m_d->ui_cuts.checkBox_cut_tracker_central->isChecked())
diff --git a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/rawdata_settings_cuts_form.ui b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/rawdata_settings_cuts_form.ui
index e31cb806..028cc4b2 100644
--- a/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/rawdata_settings_cuts_form.ui
+++ b/graphics/VTI12/VTI12Systems/VTI12RawDataSystems/src/rawdata_settings_cuts_form.ui
@@ -56,9 +56,9 @@
</widget>
</item>
<item row="1" column="0" >
- <widget class="QCheckBox" name="checkBox_cut_tracker_upstream" >
+ <widget class="QCheckBox" name="checkBox_cut_tracker_interface" >
<property name="text" >
- <string>Barrel A</string>
+ <string>Interface</string>
</property>
<property name="checked" >
<bool>true</bool>
@@ -66,9 +66,9 @@
</widget>
</item>
<item row="1" column="1" >
- <widget class="QCheckBox" name="checkBox_cut_tracker_central" >
+ <widget class="QCheckBox" name="checkBox_cut_tracker_upstream" >
<property name="text" >
- <string>Barrel C</string>
+ <string>Upstream</string>
</property>
<property name="checked" >
<bool>true</bool>
@@ -76,9 +76,19 @@
</widget>
</item>
<item row="2" column="0" >
+ <widget class="QCheckBox" name="checkBox_cut_tracker_central" >
+ <property name="text" >
+ <string>Central</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
<widget class="QCheckBox" name="checkBox_cut_tracker_downstream" >
<property name="text" >
- <string>Endcap A</string>
+ <string>Downstream</string>
</property>
<property name="checked" >
<bool>true</bool>
--
GitLab