--- DarthVader/TrackerLevel2/src/F77/readallparam.f	2006/05/19 13:15:56	1.1
+++ DarthVader/TrackerLevel2/src/F77/readallparam.f	2006/05/30 16:30:37	1.2
@@ -9,7 +9,8 @@
 
       c2f_error = 0 
 
-      if(C2F_DEBUG.eq.1)print *                   
+c      if(C2F_DEBUG.eq.1)print *                   
+      if(verbose)print *                   
      $     ,c2f_path(1:c2f_pathlen)//'trk-maskvk.dat' 
       open(10,
      $     FILE=c2f_path(1:c2f_pathlen)//'trk-maskvk.dat' !<<<< C2F
@@ -17,7 +18,8 @@
      $     ,IOSTAT=iostat
      $     )
       if(iostat.ne.0)then
-         if(C2F_DEBUG.eq.1)
+c         if(C2F_DEBUG.eq.1)
+         if(debug)
      $        print*,'READVKMASK: *** Error opening file ***'
          c2f_error = 1
          return
@@ -28,7 +30,8 @@
      $        )
      $        (mask_vk(iv,i),i=1,24)
          if(iostat.ne.0)then
-            if(C2F_DEBUG.eq.1)
+c            if(C2F_DEBUG.eq.1)
+            if(debug)
      $           print*,'READVKMASK: *** Error reading file ***'
             c2f_error = 1
             goto 1000
@@ -53,7 +56,8 @@
  201  format('trk-LADDER',i1,'-mip.dat')
       do ilad=1,nladders_view         
          write(fname_param,201)ilad
-         if(C2F_DEBUG.eq.1)print *              
+c         if(C2F_DEBUG.eq.1)print *              
+         if(VERBOSE)print *              
      $        ,c2f_path(1:c2f_pathlen)!<<<< C2F
      $        //fname_param(1:LNBLNK(fname_param))
          open(10,
@@ -63,7 +67,8 @@
      $        ,IOSTAT=iostat
      $        )
          if(iostat.ne.0)then
-            if(C2F_DEBUG.eq.1)print*
+c            if(C2F_DEBUG.eq.1)print*
+            if(DEBUG)print*
      $           ,'READMIPPARAM: *** Error opening file *** '
             c2f_error = 1
             return
@@ -95,7 +100,8 @@
  201  format('charge-l',i1,'.dat')
       do ilad=1,nladders_view         
          write(fname_param,201)ilad
-         if(C2F_DEBUG.eq.1)print * 
+c         if(C2F_DEBUG.eq.1)print * 
+         if(VERBOSE)print * 
      $        ,c2f_path(1:c2f_pathlen)!<<<< C2F
      $        //fname_param(1:LNBLNK(fname_param))
          open(10,
@@ -145,7 +151,8 @@
 	  
 ******retrieve ANGULAR BINNING info
       fname_binning='binning.dat'
-      if(C2F_DEBUG.eq.1)
+c      if(C2F_DEBUG.eq.1)
+      if(VERBOSE)
      $     print *                   
      $     ,c2f_path(1:c2f_pathlen)     !<<<< C2F
      $     //fname_binning(1:LNBLNK(fname_binning))
@@ -156,7 +163,8 @@
      $     ,IOSTAT=iostat
      $     )
       if(iostat.ne.0)then
-         if(C2F_DEBUG.eq.1) 
+c         if(C2F_DEBUG.eq.1) 
+         if(DEBUG) 
      $        print*,'READETAPARAM: *** Error in opening file *** '
          c2f_error = 1
          return
@@ -183,7 +191,8 @@
       do ieta=2,4               !loop on eta 2,3,4        
 ******retrieve correction parameters
  200     format(' Opening eta',i1,' files...')
-         if(C2F_DEBUG.eq.1)write(*,200)ieta
+c         if(C2F_DEBUG.eq.1)write(*,200)ieta
+         if(VERBOSE)write(*,200)ieta
 
  201     format('eta',i1,'-bin',i1,'-l',i1,'.dat')
  202     format('eta',i1,'-bin',i2,'-l',i1,'.dat')
@@ -199,7 +208,8 @@
      $              ,IOSTAT=iostat
      $              )
                if(iostat.ne.0)then
-                  if(C2F_DEBUG.eq.1)
+c                  if(C2F_DEBUG.eq.1)
+                  if(DEBUG)
      $                 print*,'READETAPARAM: ** Error opening file ** '
      $                 ,c2f_path(1:c2f_pathlen)
      $                 //fname_param(1:LNBLNK(fname_param))
@@ -225,7 +235,8 @@
      $                 (feta4(ival,iv,ilad,iang),iv=1,nviews)
                   if(iostat.ne.0)then
                      if(netaval.eq.0)then
-                        if(C2F_DEBUG.eq.1)print*,'READETAPARAM: '
+c                        if(C2F_DEBUG.eq.1)print*,'READETAPARAM: '
+                        if(DEBUG)print*,'READETAPARAM: '
      $                       //'*** Error reading file *** '
      $                       ,c2f_path(1:c2f_pathlen)
      $                       //fname_param(1:LNBLNK(fname_param))
@@ -275,7 +286,8 @@
          do is=1,2
 
             write(fname_param,100)ilad,is
-            if(C2F_DEBUG.eq.1)print *
+c            if(C2F_DEBUG.eq.1)print *
+            if(VERBOSE)print *
      $           ,c2f_path(1:c2f_pathlen)
      $           //fname_param
 
@@ -351,7 +363,8 @@
 
 	  c2f_error = 0
 	  
-      if(C2F_DEBUG.eq.1)print *
+c      if(C2F_DEBUG.eq.1)print *
+      if(VERBOSE)print *
      $     ,c2f_path(1:c2f_pathlen)//'mech_pos.dat'
       open(10
      $     ,FILE=