diff --git a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT1_RawDataCnv_p2.cxx b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/src/FaserSCT1_RawDataCnv_p2.cxx index 63905376875393966f0180a4e572e4a0f366e91b..aeb857d04922652bc5fd6d02c09dd1dd2df0f64e 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 73a8cdc2887a3cf3552b09c5bb422d24646b63e4..b4565d30ebdb77c5a414aa5285dd93a5b38227b8 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 56e8a56a97330f15ffd3d713c0adb7ea5ff87f98..cf9a29752dc92776437b4d26caece1a97f50e806 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 c8b26dcb1ca074b01d5475be44aebd3cdaede6ae..91f52743e6dca9ab9887413a7251894b18d24eeb 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 0fd3cf28ba27b2b3432616664197b5b286971fc8..d05dcb15eb1f2183e9068e7c0758bf27940fec57 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")