--- DarthVader/TrackerLevel2/src/F77/readB.f 2006/11/15 17:55:07 1.7 +++ DarthVader/TrackerLevel2/src/F77/readB.f 2007/08/20 16:07:16 1.8 @@ -59,11 +59,18 @@ subroutine readB include 'common_c2f.f' - LOGICAL DEBUG - LOGICAL VERBOSE - LOGICAL WARNING - COMMON/DBG/DEBUG,VERBOSE,WARNING - SAVE/DBG/ +c$$$ LOGICAL DEBUG +c$$$ LOGICAL VERBOSE +c$$$ LOGICAL WARNING +c$$$ COMMON/DBG/DEBUG,VERBOSE,WARNING +c$$$ SAVE/DBG/ + INTEGER DEBUG + INTEGER VERBOSE + INTEGER WARNING + COMMON/dbg/DEBUG,VERBOSE,WARNING + SAVE/dbg/ + + c$$$ character*256 cpath character*256 ppath @@ -119,11 +126,16 @@ include 'common_B.f' include 'common_c2f.f' - LOGICAL DEBUG - LOGICAL VERBOSE - LOGICAL WARNING - COMMON/DBG/DEBUG,VERBOSE,WARNING - SAVE/DBG/ +c$$$ LOGICAL DEBUG +c$$$ LOGICAL VERBOSE +c$$$ LOGICAL WARNING +c$$$ COMMON/DBG/DEBUG,VERBOSE,WARNING +c$$$ SAVE/DBG/ + INTEGER DEBUG + INTEGER VERBOSE + INTEGER WARNING + COMMON/dbg/DEBUG,VERBOSE,WARNING + SAVE/dbg/ character*256 path @@ -184,7 +196,7 @@ c opens magnetic field map first file c if(b_debug.eq.1)print * - if(VERBOSE)print * + if(VERBOSE.EQ.1)print * $ ,path(1:LNBLNK(path))//Bmap_file call HROPEN $ (lun_Bmap_file,'Bmap' @@ -309,7 +321,7 @@ Bmap_file='measure_n4_110402_corrected.rz' c opens magnetic field map first file c if(b_debug.eq.1)print * !,'Opening file: ' - if(VERBOSE)print * !,'Opening file: ' + if(VERBOSE.EQ.1)print * !,'Opening file: ' $ ,path(1:LNBLNK(path))//Bmap_file call HROPEN $ (lun_Bmap_file,'Bmap' @@ -430,7 +442,7 @@ c2f_error = 1 c if(b_debug.eq.1) - if(DEBUG) + if(DEBUG.EQ.1) $ print* $ ,'read_B_inner: ERROR OPENING MAGNETIC FIELD MAP FILE: ' $ ,Bmap_file @@ -447,8 +459,8 @@ 22 continue c2f_error = 1 -c if(b_debug.eq.1) - if(DEBUG) +c if(b_debug.eq.1.eq.1) + if(DEBUG.EQ.1) $ print*,'read_B_inner: ERROR WHILE READING NTUPLE, at entry $ : ',iev @@ -491,11 +503,16 @@ include 'common_B.f' include 'common_c2f.f' C - LOGICAL DEBUG - LOGICAL VERBOSE - LOGICAL WARNING - COMMON/DBG/DEBUG,VERBOSE,WARNING - SAVE/DBG/ +c$$$ LOGICAL DEBUG +c$$$ LOGICAL VERBOSE +c$$$ LOGICAL WARNING +c$$$ COMMON/DBG/DEBUG,VERBOSE,WARNING +c$$$ SAVE/DBG/ + INTEGER DEBUG + INTEGER VERBOSE + INTEGER WARNING + COMMON/dbg/DEBUG,VERBOSE,WARNING + SAVE/dbg/ character*256 path @@ -557,7 +574,7 @@ c opens magnetic field map first file c if(b_debug.eq.1)print * - if(VERBOSE)print * + if(VERBOSE.EQ.1)print * $ ,path(1:LNBLNK(path))//Bmap_file call HROPEN $ (lun_Bmap_file,'Bmap' @@ -679,7 +696,7 @@ c2f_error = 1 c if(b_debug.eq.1) - if(DEBUG) + if(DEBUG.EQ.1) $ print* $ ,'read_B_inner: ERROR OPENING MAGNETIC FIELD MAP FILE: ' $ ,Bmap_file @@ -689,7 +706,7 @@ c------------------------------------------------------------------------ c -c ntuple event reading error +c ntuple evevent reading error c c------------------------------------------------------------------------ @@ -697,7 +714,7 @@ c2f_error = 1 c if(b_debug.eq.1) - if(DEBUG) + if(DEBUG.EQ.1) $ print* $ ,'read_B_inner: ERROR WHILE READING NTUPLE, at event $ : ',iev