From 0881214c509fdc22fb8500b72f6a35332e04a698 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Wed, 9 Sep 2020 14:01:50 -0700
Subject: [PATCH] Clean-up, add event display instructions for cosmic data
---
.../src/FaserSCT1_RawDataCnv_p2.cxx | 6 +++---
.../src/FaserSCT3_RawDataCnv_p4.cxx | 6 +++---
.../src/TrackerSimDataCnv_p2.cxx | 4 ++--
graphics/VTI12/README.md | 10 +++++++++-
graphics/VTI12/VTI12Algs/share/vti12.py | 6 +++---
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT1_RawDataCnv_p2.cxx b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT1_RawDataCnv_p2.cxx
index 63905376..aeb857d0 100644
--- a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT1_RawDataCnv_p2.cxx
+++ b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT1_RawDataCnv_p2.cxx
@@ -15,15 +15,15 @@
void
-FaserSCT1_RawDataCnv_p2::persToTrans(const TrackerRawData_p2* persObj, FaserSCT1_RawData* transObj, MsgStream& log)
+FaserSCT1_RawDataCnv_p2::persToTrans(const TrackerRawData_p2* persObj, FaserSCT1_RawData* transObj, MsgStream& /*log*/)
{
- MSG_VERBOSE(log,"FaserSCT1_RawDataCnv_p2::persToTrans called ");
+ // MSG_VERBOSE(log,"FaserSCT1_RawDataCnv_p2::persToTrans called ");
*transObj = FaserSCT1_RawData(Identifier(persObj->m_rdoId),
persObj->m_word);
}
void
-FaserSCT1_RawDataCnv_p2::transToPers(const FaserSCT1_RawData* transObj, TrackerRawData_p2* persObj, MsgStream& log)
+FaserSCT1_RawDataCnv_p2::transToPers(const FaserSCT1_RawData* transObj, TrackerRawData_p2* persObj, MsgStream& /*log*/)
{
// MSG_VERBOSE(log,"FaserSCT1_RawDataCnv_p2::transToPers called ");
persObj->m_rdoId = transObj->identify().get_compact();
diff --git a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT3_RawDataCnv_p4.cxx b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT3_RawDataCnv_p4.cxx
index 73a8cdc2..b4565d30 100644
--- a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT3_RawDataCnv_p4.cxx
+++ b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT3_RawDataCnv_p4.cxx
@@ -13,9 +13,9 @@
#include <vector>
void
-FaserSCT3_RawDataCnv_p4::persToTrans(const FaserSCT3_RawData_p4* persObj, FaserSCT3_RawData* transObj, MsgStream& log)
+FaserSCT3_RawDataCnv_p4::persToTrans(const FaserSCT3_RawData_p4* persObj, FaserSCT3_RawData* transObj, MsgStream& /*log*/)
{
- MSG_DEBUG(log, "FaserSCT3_RawDataCnv_p4::persToTrans called");
+ // MSG_DEBUG(log, "FaserSCT3_RawDataCnv_p4::persToTrans called");
// Convert unsigned short to unsigned int
// P: Bits 0-10 for group size, Bits 11-13 for time bin
@@ -32,7 +32,7 @@ FaserSCT3_RawDataCnv_p4::persToTrans(const FaserSCT3_RawData_p4* persObj, FaserS
}
void
-FaserSCT3_RawDataCnv_p4::transToPers(const FaserSCT3_RawData* transObj, FaserSCT3_RawData_p4* persObj, MsgStream& log)
+FaserSCT3_RawDataCnv_p4::transToPers(const FaserSCT3_RawData* transObj, FaserSCT3_RawData_p4* persObj, MsgStream& /*log*/)
{
// MSG_DEBUG(log, "FaserSCT3_RawDataCnv_p4::transToPers called");
diff --git a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/TrackerSimDataCnv_p2.cxx b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/TrackerSimDataCnv_p2.cxx
index 56e8a56a..cf9a2975 100644
--- a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/TrackerSimDataCnv_p2.cxx
+++ b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/TrackerSimDataCnv_p2.cxx
@@ -20,9 +20,9 @@ TrackerSimDataCnv_p2::TrackerSimDataCnv_p2()
void
-TrackerSimDataCnv_p2::persToTrans(const TrackerSimData_p2* persObj, TrackerSimData* transObj, MsgStream &log)
+TrackerSimDataCnv_p2::persToTrans(const TrackerSimData_p2* persObj, TrackerSimData* transObj, MsgStream& log)
{
- MSG_VERBOSE(log,"TrackerSimDataCnv_p2::persToTrans called ");
+ // MSG_VERBOSE(log,"TrackerSimDataCnv_p2::persToTrans called ");
std::vector<TrackerSimData::Deposit> deposits;
deposits.reserve( persObj->m_enDeposits.size() );
for (unsigned int icount=0; icount < persObj->m_enDeposits.size(); icount++) {
diff --git a/graphics/VTI12/README.md b/graphics/VTI12/README.md
index c8b26dcb..91f52743 100644
--- a/graphics/VTI12/README.md
+++ b/graphics/VTI12/README.md
@@ -6,4 +6,12 @@ To run on Calypso MC data (from an installation (run) directory):
% vti12 -mc -noautoconf -nosortdbreplicas <input HITS or EVNT file>
-Note that VP1PLUGINPATH can be ninja-changed by asetup, and if it does not include the Calypso installation library folder, nothing will work
\ No newline at end of file
+Note that VP1PLUGINPATH can be ninja-changed by asetup, and if it does not include the Calypso installation library folder, nothing will work
+
+To run on cosmic ray data (RDO output from the TrackerDataAccess example programs), with the correct geometry, do the following commands instead:
+
+% source ./setup.sh
+
+% export VP1PLUGINPATH=./lib
+
+% vti12 -noautoconf -nosortdbreplicas -detdescr='FASER-CR' <input RDO file>
\ No newline at end of file
diff --git a/graphics/VTI12/VTI12Algs/share/vti12.py b/graphics/VTI12/VTI12Algs/share/vti12.py
index 0fd3cf28..d05dcb15 100644
--- a/graphics/VTI12/VTI12Algs/share/vti12.py
+++ b/graphics/VTI12/VTI12Algs/share/vti12.py
@@ -37,7 +37,7 @@ if not 'vp1NoAutoConf' in dir(): vp1NoAutoConf=False
if not 'vp1Trig' in dir(): vp1Trig=False
if not 'vp1NSW' in dir(): vp1NSW=False
-def vp1CfgErr(s): print "VP1 CONFIGURATION ERROR: %s" % s
+def vp1CfgErr(s): printfunc ("VP1 CONFIGURATION ERROR: %s" % s)
if (vp1Fatras and not vp1ID):
vp1CfgErr("Fatras can not be enabled without inner detector. Turning off Fatras.")
@@ -65,8 +65,8 @@ if (vp1NSW and not vp1Muon):
-print "*** VP1 NOTE *** setting COIN_GLXGLUE env vars to make screenshots working remotely..."
-print "*** VP1 NOTE *** COIN_GLXGLUE_NO_GLX13_PBUFFERS=1 - " + "COIN_GLXGLUE_NO_PBUFFERS=1"
+printfunc("*** VP1 NOTE *** setting COIN_GLXGLUE env vars to make screenshots working remotely...")
+printfunc("*** VP1 NOTE *** COIN_GLXGLUE_NO_GLX13_PBUFFERS=1 - " + "COIN_GLXGLUE_NO_PBUFFERS=1")
os.putenv("COIN_GLXGLUE_NO_GLX13_PBUFFERS","1")
os.putenv("COIN_GLXGLUE_NO_PBUFFERS","1")
--
GitLab