From 1d4969974bb293792c636978be4d5c8c4370f9f0 Mon Sep 17 00:00:00 2001 From: Alex Barnes Date: Tue, 8 Dec 2015 11:32:03 -0500 Subject: [PATCH] Changed PSC_TW and PS_E_calib brun and evnt arugment types for JANA 0.7.4p1 --- src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.cc | 4 ++-- src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.h | 4 ++-- .../Calibration/PS_E_calib/JEventProcessor_PS_E_calib.cc | 4 ++-- .../Calibration/PS_E_calib/JEventProcessor_PS_E_calib.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.cc b/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.cc index 5be3308d3..1349d9aa2 100644 --- a/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.cc +++ b/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.cc @@ -100,7 +100,7 @@ jerror_t JEventProcessor_PSC_TW::init(void) //------------------ // brun //------------------ -jerror_t JEventProcessor_PSC_TW::brun(JEventLoop *eventLoop, int runnumber) +jerror_t JEventProcessor_PSC_TW::brun(JEventLoop *eventLoop, int32_t runnumber) { // This is called whenever the run number changes @@ -122,7 +122,7 @@ jerror_t JEventProcessor_PSC_TW::brun(JEventLoop *eventLoop, int runnumber) //------------------ // evnt //------------------ -jerror_t JEventProcessor_PSC_TW::evnt(JEventLoop *loop, int eventnumber) +jerror_t JEventProcessor_PSC_TW::evnt(JEventLoop *loop, uint64_t eventnumber) { // This is called for every event. Use of common resources like writing // to a file or filling a histogram should be mutex protected. Using diff --git a/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.h b/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.h index d45eeb644..2f874150c 100644 --- a/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.h +++ b/src/plugins/Calibration/PSC_TW/JEventProcessor_PSC_TW.h @@ -21,8 +21,8 @@ class JEventProcessor_PSC_TW:public jana::JEventProcessor{ private: jerror_t init(void); ///< Called once at program start. - jerror_t brun(jana::JEventLoop *eventLoop, int runnumber); ///< Called everytime a new run number is detected. - jerror_t evnt(jana::JEventLoop *eventLoop, int eventnumber); ///< Called every event. + jerror_t brun(jana::JEventLoop *eventLoop, int32_t runnumber); ///< Called everytime a new run number is detected. + jerror_t evnt(jana::JEventLoop *eventLoop, uint64_t eventnumber); ///< Called every event. jerror_t erun(void); ///< Called everytime run number changes, provided brun has been called. jerror_t fini(void); ///< Called after last event of last event source has been processed. }; diff --git a/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.cc b/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.cc index b47921c9f..39c7c6a66 100644 --- a/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.cc +++ b/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.cc @@ -143,7 +143,7 @@ jerror_t JEventProcessor_PS_E_calib::init(void) //------------------ // brun //------------------ -jerror_t JEventProcessor_PS_E_calib::brun(JEventLoop *eventLoop, int runnumber) +jerror_t JEventProcessor_PS_E_calib::brun(JEventLoop *eventLoop, int32_t runnumber) { // This is called whenever the run number changes @@ -169,7 +169,7 @@ jerror_t JEventProcessor_PS_E_calib::brun(JEventLoop *eventLoop, int runnumber) //------------------ // evnt //------------------ -jerror_t JEventProcessor_PS_E_calib::evnt(JEventLoop *loop, int eventnumber) +jerror_t JEventProcessor_PS_E_calib::evnt(JEventLoop *loop, uint64_t eventnumber) { // This is called for every event. Use of common resources like writing // to a file or filling a histogram should be mutex protected. Using diff --git a/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.h b/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.h index 2a1b77d78..2a19bae8d 100644 --- a/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.h +++ b/src/plugins/Calibration/PS_E_calib/JEventProcessor_PS_E_calib.h @@ -18,8 +18,8 @@ class JEventProcessor_PS_E_calib:public jana::JEventProcessor{ private: jerror_t init(void); ///< Called once at program start. - jerror_t brun(jana::JEventLoop *eventLoop, int runnumber); ///< Called everytime a new run number is detected. - jerror_t evnt(jana::JEventLoop *eventLoop, int eventnumber); ///< Called every event. + jerror_t brun(jana::JEventLoop *eventLoop, int32_t runnumber); ///< Called everytime a new run number is detected. + jerror_t evnt(jana::JEventLoop *eventLoop, uint64_t eventnumber); ///< Called every event. jerror_t erun(void); ///< Called everytime run number changes, provided brun has been called. jerror_t fini(void); ///< Called after last event of last event source has been processed. };