From 4baa2c3ad88d3980f419474e9d7db4519b8ff31e Mon Sep 17 00:00:00 2001 From: Ross Miller Date: Thu, 25 Apr 2013 12:41:58 -0400 Subject: [PATCH] Don't parse RTDL packets Removed the code for parsing the RTDL packets. Also removed the code in the BankedEventPkt parser that checked the pulse ID on the RDTL packets. Refs #6932 --- .../SNSLiveEventDataListener.h | 1 - .../src/SNSLiveEventDataListener.cpp | 33 +------------------ 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SNSLiveEventDataListener.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SNSLiveEventDataListener.h index 27d8c68c127c..6d40821ab0fc 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SNSLiveEventDataListener.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SNSLiveEventDataListener.h @@ -70,7 +70,6 @@ namespace Mantid using ADARA::Parser::rxPacket; //virtual bool rxPacket( const ADARA::Packet &pkt); //virtual bool rxPacket( const ADARA::RawDataPkt &pkt); - virtual bool rxPacket( const ADARA::RTDLPkt &pkt); virtual bool rxPacket( const ADARA::BankedEventPkt &pkt); virtual bool rxPacket( const ADARA::GeometryPkt &pkt); virtual bool rxPacket( const ADARA::BeamlineInfoPkt &pkt); diff --git a/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp b/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp index ce0c964fc8b5..9438104e7ea1 100644 --- a/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp +++ b/Code/Mantid/Framework/DataHandling/src/SNSLiveEventDataListener.cpp @@ -322,21 +322,6 @@ namespace DataHandling } - /// Parse an RTDL packet - - /// Overrides the default function defined in ADARA::Parser and processes - /// data from ADARA::RTDLPkt packets. - /// @param pkt The packet to be parsed - /// @return Returns false if there were no problems. Returns true if there - /// was an error and packet parsing should be interrupted - bool SNSLiveEventDataListener::rxPacket( const ADARA::RTDLPkt &pkt) - { - // At the moment, all we need from the RTDL packets is the pulse - // time (and its questionable whether we even need that). - m_rtdlPulseId = pkt.pulseId(); - return false; - } - /// Parse a banked event packet /// Overrides the default function defined in ADARA::Parser and processes @@ -347,10 +332,6 @@ namespace DataHandling /// @param pkt The packet to be parsed /// @return Returns false if there were no problems. Returns true if there /// was an error and packet parsing should be interrupted - // Note: Before we can process a particular BankedEventPkt, we must have - // received the RTDLPkt for pulse ID specified in the BankedEventPkt. - // Normally this won't be an issue since the SMS will send out RTDLPkts - // before it sends BankedEventPkts. bool SNSLiveEventDataListener::rxPacket( const ADARA::BankedEventPkt &pkt) { @@ -358,19 +339,7 @@ namespace DataHandling unsigned eventsPerBank = 0; unsigned totalEvents = 0; - // First step - make sure the RTDL packet we've saved matches the - // banked event packet we've just received and make sure its RAW flag - // is false - if (pkt.pulseId() != m_rtdlPulseId) - { - // Wrong RTDL packet. Fail! - g_log.error() << "Ignoring data from Pulse ID" << pkt.pulseId() - << "because we have not received an RTDL packet for that pulse!" - << std::endl; - return false; - } - - // Next - check to see if the run has been paused. We don't process + // First, check to see if the run has been paused. We don't process // the events if we're paused unless the user has specifically overridden // this behavior with the livelistener.keeppausedevents property. if (m_runPaused && m_keepPausedEvents == false)