--- DarthVader/ToFLevel2/src/rdtofcal.for	2006/10/20 12:22:18	1.2
+++ DarthVader/ToFLevel2/src/rdtofcal.for	2006/11/09 17:05:48	1.4
@@ -1,5 +1,5 @@
 C------------------------------------------------
-      FUNCTION RDTOFCAL(calname)
+      FUNCTION RDTOFCAL(calname,cnlen)
 C------------------------------------------------
 
       include 'input_tof.txt'
@@ -15,8 +15,9 @@
 c------------------------------------------------------------------------
       character*250 calname
       character*250 calname1
-      character ch
-      character*2 ch2 
+c      character ch
+c      character*2 ch2 
+      integer cnlen
 c------------------------------------------------------------------
 
       COMMON/QUEST/IQUEST(100)
@@ -41,38 +42,56 @@
 c---------------    open ToF calib rz file 
 c------------------------------------------------------------------------
 
-       do ii=1,250
+c       do ii=1,250
 c         ch=calname(ii:ii)
-         ch2=calname(ii:ii+1)
-c         write(*,*) ii,ch
 c         if (ch.eq.'.') goto 100
-         if (ch2.eq.'rz') goto 100
-       enddo   
-100   continue
+c       enddo   
+c100   continue
 c      calname1 = calname(1:ii)//'rz'
-       calname1 = calname(1:ii+1)
 
-c      print*,'__________ opening TOF calib rz file __________'
-c      print*,calname
-c      print*,calname1
+c      do ii=1,250
+cc         ch=calname(ii:ii)
+c         ch2=calname(ii:ii+1)
+cc         write(*,*) ii,ch
+cc         if (ch.eq.'.') goto 100
+c         if (ch2.eq.'rz') goto 100
+c       enddo
+c100   continue
+c      calname1 = calname(1:ii)//'rz'
+c       calname1 = calname(1:ii+1)
+
+      calname1 = calname(1:cnlen)
+
+
+
  
-       CALL HROPEN(59,'TOF K1A',calname1,'QP',4096,istat)
+       CALL HROPEN(59,'TOFK1131',calname1,'QP',4096,istat)
 
         if (istat.ne.0) then  ! check if HROPEN was OK
               write(*,*) 'Can''t open correct ToF calibration File !!!'
         stop
         endif
 
-c        print*,' reading TOF CALIB n-tuple...'
-
         call HRIN(ntp_tofcalib,9999,0)
 
         call HBNAME(ntp_tofcalib,' ',0,'$CLEAR')
 
-        call HBNAME(ntp_tofcalib,'TOFKA',k_s11s31,'$SET')
-        call HBNAME(ntp_tofcalib,'TOFKB',k_s12s32,'$SET')
-        call HBNAME(ntp_tofcalib,'TOFKC',k_s21s31,'$SET')
-        call HBNAME(ntp_tofcalib,'TOFKD',k_s22s32,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK1131',k_s11s31,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK1132',k_s11s32,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK1231',k_s12s31,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK1232',k_s12s32,'$SET')
+
+        call HBNAME(ntp_tofcalib,'TOFK2131',k_s21s31,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK2132',k_s21s32,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK2231',k_s22s31,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK2232',k_s22s32,'$SET')
+
+        call HBNAME(ntp_tofcalib,'TOFK1121',k_s11s21,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK1122',k_s11s22,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK1221',k_s12s21,'$SET')
+        call HBNAME(ntp_tofcalib,'TOFK1222',k_s12s22,'$SET')
+
+C--------------
 
         call HBNAME(ntp_tofcalib,'TOFLIN11',y_coor_lin11,'$SET')
         call HBNAME(ntp_tofcalib,'TOFLIN12',x_coor_lin12,'$SET')
@@ -98,15 +117,13 @@
 c        call HPRNTU(ntp_tofcalib)
 
         call HNOENT(ntp_tofcalib,iemax_cal)
-c        write(*,*) 'Number of Events CALIB ',iemax_cal
 
         do iev=1,iemax_cal
            call HGNT(ntp_tofcalib,iev,ierr) !reads an event
-c           write(34,*)iev,k1_s11s31,y_coor_lin11,tw11
         enddo
 
         call hrout(ntp_tofcalib,icycle,' ')
-        call hrend('TOF K1A')
+        call hrend('TOFK1131')
         close(0)
 
          return