@@ -89,11 +89,20 @@ void MonitorGui()
8989 TGTextButton * mFrameNextEvent = new TGTextButton (mContRight , "&Next Event" );
9090 mContRight -> AddFrame (mFrameNextEvent , new TGLayoutHints (kLHintsExpandX ));
9191
92- mFrameNextEvent -> SetCommand ( "Next()" );
92+ mFrameNextEvent -> SetCommand ( "Next(-1 )" );
9393 mFrameNextEvent -> SetTextColor (200 );
9494 mFrameNextEvent -> SetToolTipText ("Go to next event" );
9595 mFrameNextEvent -> MoveResize (10 , 10 , xsize , (UInt_t )ysize );
9696
97+ //---------------------------
98+ TGTextButton * mFramePreviousEvent = new TGTextButton (mContRight , "&Previous Event" );
99+ mContRight -> AddFrame (mFramePreviousEvent , new TGLayoutHints (kLHintsExpandX ));
100+
101+ mFramePreviousEvent -> SetCommand ( "Next(-2)" );
102+ mFramePreviousEvent -> SetTextColor (200 );
103+ mFramePreviousEvent -> SetToolTipText ("Go to next event" );
104+ mFramePreviousEvent -> MoveResize (10 , 10 + ysize , xsize , (UInt_t )ysize );
105+
97106 //---------------------------
98107 //TGTextButton* mFrameRewindEvent = new TGTextButton(mContRight, "Rewind Events" );
99108 //mContRight->AddFrame(mFrameRewindEvent, new TGLayoutHints(kLHintsExpandX));
@@ -201,7 +210,7 @@ void DrawPadSignal(TString type)
201210 //mRawReader->Reset();
202211 TH1D * h2 = mEvDisp .MakePadSignals (roc ,row ,pad );
203212 if (h2 ) {
204- h2 -> GetXaxis ()-> SetRangeUser (0 ,35 );
213+ h2 -> GetXaxis ()-> SetRangeUser (0 ,mEvDisp . getNumberOfProcessedTimeBins () + 5 );
205214 h2 -> Draw ();
206215 h2 -> SetStats (0 );
207216 }
@@ -222,7 +231,8 @@ void FillMaxHists(Int_t type=0)
222231 TH2F * hROC = 0x0 ;
223232 ResetHists (type );
224233 const int runNumber = TString (gSystem -> Getenv ("RUN_NUMBER" )).Atoi ();
225- const int eventNumber = mEvDisp .getNumberOfProcessedEvents () - 1 ;
234+ //const int eventNumber = mEvDisp.getNumberOfProcessedEvents() - 1;
235+ const int eventNumber = mEvDisp .getPresentEventNumber ();
226236 for (Int_t iROC = 0 ; iROC < 72 ; iROC ++ ){
227237 // TODO: remove again at some point
228238 if (iROC > 0 ) break ;
@@ -382,13 +392,14 @@ void InitGUI()
382392}
383393
384394//__________________________________________________________________________
385- void Next ()
395+ void Next (int eventNumber = -1 )
386396{
387397 //Int_t ev=mRawReader->NextEvent();
388398 //if (!ev) return;
389399 using Status = CalibRawBase ::ProcessStatus ;
390- Status status = mEvDisp .ProcessEvent ();
391- const Int_t timeBins = mEvDisp .getTimeBinsPerCall ();
400+ Status status = mEvDisp .ProcessEvent (eventNumber );
401+ //const Int_t timeBins = mEvDisp.getTimeBinsPerCall();
402+ const Int_t timeBins = mEvDisp .getNumberOfProcessedTimeBins ();
392403
393404 switch (status ) {
394405 case Status ::Ok : {
0 commit comments