Changed PSC_TW and PS_E_calib brun and evnt arugment types for JANA 0…

….7.4p1
JeffersonLab · Dec 8, 2015 · 1d49699 · 1d49699
1 parent 18881ab
commit 1d49699
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.
 };