*** BeamData.cc	2010-03-12 01:15:00.000000000 +0900
--- ../../BeamData.cc	2010-07-17 15:30:14.721167000 +0900
***************
*** 4,9 ****
--- 4,11 ----
  #include <fstream>
+ #include <stdlib.h>
  #include "BeamData/BeamData.h"
  
+ //#define DEBUG
  
  //
  BeamData* BeamData::s_instance = 0;
***************
*** 109,115 ****
--- 110,118 ----
  BeamData::init_db()
  {
      //
+ 	#ifdef DEBUG
      std::cout << "BeamData::init_db() : "  << m_dbdir << " " << m_basedir << std::endl;
+ #endif
  
      for(int r=m_mrrun_begin; r<=m_mrrun_end; r++) {
  	TString dbfname;
***************
*** 117,123 ****
--- 120,128 ----
  	dbfname = m_dbdir + dbfname;
  
  	if( access(dbfname.Data(),R_OK) == 0 ){
+ #ifdef DEBUG
  	    std::cout << "reading " << dbfname.Data() << std::endl;
+ #endif
  
  	    std::ifstream dbfile( dbfname.Data() );
  	    if( dbfile.good() ) {
***************
*** 134,140 ****
--- 139,147 ----
  			break;
  		    
  		    
+ #ifdef DEBUG
  		    std::printf("%s %d %d %d %d %d\n", fname.c_str(), runnum, start_unixtime, stop_unixtime, start_spillnum, stop_spillnum);
+ #endif
  		    
  		    
  		    TString fpathname;
***************
*** 152,157 ****
--- 159,165 ----
      }
  
      //
+ #ifdef DEBUG
      for(unsigned int i=0; i<m_db.size(); i++) {
  	std::printf("%s %d %d %d %d %d %ld %ld\n",
  		    m_db[i].fname.Data(), 
***************
*** 160,165 ****
--- 168,174 ----
  		    m_db[i].start_spillnum, m_db[i].stop_spillnum,
  		    m_db[i].nevent, m_db[i].top_index );
      }
+ #endif
  
  }
  
***************
*** 270,276 ****
      
      //
      bool is_good = false;
!     for(int i=m_start_index; i<m_last_index; i++) {
  	int ret = m_chain->GetEntry(i);
  	if( ret < 0 ) {
  	    std::cerr << "Error in reading file" << std::endl;
--- 279,285 ----
      
      //
      bool is_good = false;
!     for(int i=m_start_index; i<=m_last_index; i++) {
  	int ret = m_chain->GetEntry(i);
  	if( ret < 0 ) {
  	    std::cerr << "Error in reading file" << std::endl;
***************
*** 279,285 ****
  	int spill_comet_this = 1 + (m_data.spillnum)&0xFFFF;
  	int dt               = TMath::Abs( m_data.trg_sec[0] - unixtime );
  
! 	if( (spill_comet_this == spill_comet) && (dt < dt_cut) ) {
  	    is_good = true;
  
  	    m_current_spill_comet = spill_comet;
--- 288,294 ----
  	int spill_comet_this = 1 + (m_data.spillnum)&0xFFFF;
  	int dt               = TMath::Abs( m_data.trg_sec[0] - unixtime );
  
! 	if( (spill_comet_this == spill_comet) && (dt <= dt_cut) ) {
  	    is_good = true;
  
  	    m_current_spill_comet = spill_comet;