*** ./BeamData.h	Fri Mar 12 01:15:00 2010
--- ../../../BeamData.h	Wed Jul 14 11:53:05 2010
***************
*** 104,111 ****
      Double_t beam_timing( int ch )         const { return (0<=ch && ch<5) ? m_data.beam_time[ch][0] : 0; }
      Double_t bunch_timing( int ch, int b ) const { return (ch<=ch && ch<5 && 1<=b && b<=8) ? m_data.beam_time[ch][b] : 0; }
  
!     Double_t beam_flag( int ch )           const { return (0<=ch && ch<5) ? m_data.beam_flag[ch][0] : 0; }
!     Double_t bunch_flag( int ch, int b )   const { return (ch<=ch && ch<5 && 1<=b && b<=8) ? m_data.beam_flag[ch][b] : 0; }
  
  
      Double_t horn_current( int ihorn )                const { return (0<=ihorn && ihorn<3) ? m_data.hct[ihorn][0] : 0; }
--- 104,111 ----
      Double_t beam_timing( int ch )         const { return (0<=ch && ch<5) ? m_data.beam_time[ch][0] : 0; }
      Double_t bunch_timing( int ch, int b ) const { return (ch<=ch && ch<5 && 1<=b && b<=8) ? m_data.beam_time[ch][b] : 0; }
  
!     Int_t beam_flag( int ch )           const { return (0<=ch && ch<5) ? m_data.beam_flag[ch][0] : 0; }
!     Int_t bunch_flag( int ch, int b )   const { return (ch<=ch && ch<5 && 1<=b && b<=8) ? m_data.beam_flag[ch][b] : 0; }
  
  
      Double_t horn_current( int ihorn )                const { return (0<=ihorn && ihorn<3) ? m_data.hct[ihorn][0] : 0; }