linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiled under Redhat Linux<Right

Browse Source
This commit is contained in:
cvs
2000-02-18 15:54:23 +00:00
parent b9529f1cfd
commit cbc7fdf334
48 changed files with 160 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -7,15 +7,18 @@ BINTARGET=$(HOME)/bin/sics
#FORTIFYOBJ = fortify.o strdup.o #FORTIFYOBJ = fortify.o strdup.o
FORTIFYOBJ = FORTIFYOBJ =
CC=cc #CC=cc
#CC=gcc CC=gcc
TCLOBJ=initcl.o TCLOBJ=initcl.o
#TCLOBJ=init8.o #TCLOBJ=init8.o
#comment and uncomment according if a difrac version is required #comment and uncomment according if a difrac version is required
#DIFOBJ= #DIFOBJ=
#DIFIL= #DIFIL=
DIFOBJ=difrac.o -Ldifrac -ldif -lfor #DIFOBJ=difrac.o -Ldifrac -ldif -lfor
#---- for Linux
DIFOBJ=difrac.o -Ldifrac -ldif
DIFIL= difrac.o DIFIL= difrac.o
COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ) COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ)
@ -46,25 +49,34 @@ VELOOBJ = velo.o velosim.o velodorn.o velodornier.o
.SUFFIXES: .tcl .htm .c .o .SUFFIXES: .tcl .htm .c .o
CFLAGS = -I/data/koenneck/include -Ihardsup -std1 -g -warnprotos -c #CFLAGS = -I/data/koenneck/include -Ihardsup -std1 -g -warnprotos -c
#CFLAGS = -I/data/koenneck/include -DFORTIFY -Ihardsup -g -std1 -warnprotos -c #CFLAGS = -I/data/koenneck/include -DFORTIFY -Ihardsup -g -std1 -warnprotos -c
#CFLAGS = -I/data/koenneck/include -Ihardsup -std1 -warnprotos -c #CFLAGS = -I/data/koenneck/include -Ihardsup -std1 -warnprotos -c
LIBS = -L/data/koenneck/lib -Lhardsup -lhlib -ltcl7.6 -lmfhdf -ldf \ #LIBS = -L/data/koenneck/lib -Lhardsup -lhlib -ltcl7.6 -lmfhdf -ldf \
/data/koenneck/lib/libjpeg.a -lz -lm -ll -lc # /data/koenneck/lib/libjpeg.a -lz -lm -ll -lc
# for cygnus # for cygnus
#CFLAGS = -I../HDF411/include -Ihardsup -DFORTIFY -DCYGNUS -g -c #CFLAGS = -I../HDF411/include -Ihardsup -DFORTIFY -DCYGNUS -g -c
#LIBS= -L../HDF411/lib -Lhardsup -lhlib -ltcl80 \ #LIBS= -L../HDF411/lib -Lhardsup -lhlib -ltcl80 \
# -lmfhdf -ldf -ljpeg -lz -lm # -lmfhdf -ldf -ljpeg -lz -lm
# for linux
CFLAGS = -I/usr/local/include -Ihardsup -fwritable-strings -DCYGNUS -g -c
LIBS= -L/usr/local/lib -Lhardsup -L /home/koenneck/tcl76/lib -lhlib -ltcl7.6 \
-lmfhdf -ldf -ljpeg -lz -lm -lg2c -ldl
#EXTRA=
EXTRA=nintf.o
.c.o: .c.o:
$(CC) $(CFLAGS) $*.c $(CC) $(CFLAGS) $*.c
all: server all: server
server: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) $(VELOOBJ) $(DIFIL) server: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) $(VELOOBJ) $(DIFIL) \
$(EXTRA)
$(CC) -g -o SICServer $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) \ $(CC) -g -o SICServer $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) \
$(VELOOBJ) $(DIFOBJ) $(LIBS) $(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS)
cp SICServer $(BINTARGET) cp SICServer $(BINTARGET)
clean: clean:

2
danu.dat
View File

@ -1,3 +1,3 @@
45 50
NEVER, EVER modify or delete this file NEVER, EVER modify or delete this file
You'll risk eternal damnation and a reincarnation as a cockroach!|n You'll risk eternal damnation and a reincarnation as a cockroach!|n

1
difrac/alfnum.f
View File

@ -48,4 +48,3 @@ C-----------------------------------------------------------------------
RETURN RETURN
10000 FORMAT (A) 10000 FORMAT (A)
END END


4
difrac/align.f
View File

@ -133,7 +133,7 @@ C-----------------------------------------------------------------------
ENDIF ENDIF
ENDIF ENDIF
CALL SHUTTR (1) CALL SHUTTR (1)
CALL CTIME (PRESET,CT1) CALL CCTIME (PRESET,CT1)
CALL SHUTTR (-1) CALL SHUTTR (-1)
WRITE (COUT,23000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI,CT1 WRITE (COUT,23000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI,CT1
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
@ -303,7 +303,7 @@ C-----------------------------------------------------------------------
ENDIF ENDIF
ENDIF ENDIF
CALL SHUTTR (1) CALL SHUTTR (1)
CALL CTIME (PRESET,CT1) CALL CCTIME (PRESET,CT1)
CALL SHUTTR (-1) CALL SHUTTR (-1)
WRITE (LPT,30000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI,CT1 WRITE (LPT,30000) IH,IK,IL,RTHETA,ROMEGA,RCHI,RPHI,CT1
IF (ITRUE .EQ. 1) THEN IF (ITRUE .EQ. 1) THEN

4
difrac/cellls.f
View File

@ -61,7 +61,7 @@ C-----------------------------------------------------------------------
KI = ' ' KI = ' '
RETURN RETURN
10000 FORMAT (/10X,'Constrained Cell Dimension Least-Squares'/) 10000 FORMAT (/10X,'Constrained Cell Dimension Least-Squares'/)
11000 FORMAT (/' Wavelength'F10.6,'; ',I6,' reflections.') 11000 FORMAT (/' Wavelength',F10.6,'; ',I6,' reflections.')
12000 FORMAT (' Less than 6 reflections. Quit') 12000 FORMAT (' Less than 6 reflections. Quit')
END END
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
@ -625,4 +625,4 @@ C-----------------------------------------------------------------------
220 CONTINUE 220 CONTINUE
RETURN RETURN
END END


6
difrac/cellsd.f
View File

@ -115,9 +115,9 @@ C-----------------------------------------------------------------------
$ SAS(1),SAS(2),SAS(3),SANS(1),SANS(2),SANS(3) $ SAS(1),SAS(2),SAS(3),SANS(1),SANS(2),SANS(3)
RETURN RETURN
10000 FORMAT (/,' Real Cell'/ 10000 FORMAT (/,' Real Cell'/
$ 3X,'a', 11X,'b', 11X,'c', 9X,'alpha', 6X'beta', 5X,'gamma'/ $ 3X,'a', 11X,'b', 11X,'c', 9X,'alpha', 6X, 'beta', 5X,'gamma'/
$ 3(F9.5,3X),3(F7.3,3X)/3(F9.5,3X),3(F7.3,3X)) $ 3(F9.5,3X),3(F7.3,3X)/3(F9.5,3X),3(F7.3,3X))
11000 FORMAT (/,' Reciprocal Cell'/ 11000 FORMAT (/,' Reciprocal Cell'/
$ 3X,'a*',10X,'b*',10X,'c*',8X,'alpha*',5X'beta*',4X,'gamma*'/ $ 3X,'a*',10X,'b*',10X,'c*',8X,'alpha*',5X, 'beta*',4X,'gamma*'/
$ 3(1X,F8.6,3X),3(F7.3,3X)/3(1X,F8.6,3X),3(F7.3,3X)) $ ,3(1X,F8.6,3X),3(F7.3,3X)/3(1X,F8.6,3X),3(F7.3,3X))
END END

4
difrac/cent8.f
View File

@ -253,7 +253,7 @@ C-----------------------------------------------------------------------
WRITE (LPT,24000) IH,IK,IL,THETA,OMEGA,CHI,PHI WRITE (LPT,24000) IH,IK,IL,THETA,OMEGA,CHI,PHI
CALL WXW2T (DT,DO,DC,ISLIT) CALL WXW2T (DT,DO,DC,ISLIT)
CALL SHUTTR (1) CALL SHUTTR (1)
CALL CTIME (MPRESET,COUNT) CALL CCTIME (MPRESET,COUNT)
CALL KORQ(INTERRUPT) CALL KORQ(INTERRUPT)
IF(INTERRUPT .NE. 1) THEN IF(INTERRUPT .NE. 1) THEN
WRITE(COUT,37000) WRITE(COUT,37000)
@ -373,7 +373,7 @@ C14000 FORMAT (' Type the Crystal-to-Detector distance (',I3,'mm) ',$)
18000 FORMAT (' Type the max count cutoff fraction (0.5) ',$) 18000 FORMAT (' Type the max count cutoff fraction (0.5) ',$)
19000 FORMAT (' Type h,k,l for reflections to be used (End) ') 19000 FORMAT (' Type h,k,l for reflections to be used (End) ')
C22000 FORMAT (' The 1st reflection is set. Is everything OK (Y) ? ',$) C22000 FORMAT (' The 1st reflection is set. Is everything OK (Y) ? ',$)
23000 FORMAT (' Setting',I2', Collision. Cannot complete',3I4) 23000 FORMAT (' Setting',I2,', Collision. Cannot complete',3I4)
24000 FORMAT (' Starting values ',3I4,4F10.3) 24000 FORMAT (' Starting values ',3I4,4F10.3)
25000 FORMAT (' Setting',I2,' of',3I4,' failed on first attempt.') 25000 FORMAT (' Setting',I2,' of',3I4,' failed on first attempt.')
25100 FORMAT (' Setting',I2,' of',3I4,' failed. Cannot complete') 25100 FORMAT (' Setting',I2,' of',3I4,' failed. Cannot complete')

4
difrac/centre.f
View File

@ -66,7 +66,7 @@ C-----------------------------------------------------------------------
KI = 'FF' KI = 'FF'
RETURN RETURN
ENDIF ENDIF
CALL CTIME (PRESET,COUNT) CALL CCTIME (PRESET,COUNT)
CALL KORQ(IRUPT) CALL KORQ(IRUPT)
IF(IRUPT .NE. 1) THEN IF(IRUPT .NE. 1) THEN
WRITE (COUT,10000) WRITE (COUT,10000)
@ -282,7 +282,7 @@ C-----------------------------------------------------------------------
C Set the attenuator if necessary C Set the attenuator if necessary
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
TIME = 1.0 TIME = 1.0
CALL CTIME (TIME,COUNT) CALL CCTIME (TIME,COUNT)
IF (COUNT .GT. ICPSMX .AND. NATT .EQ. 0) THEN IF (COUNT .GT. ICPSMX .AND. NATT .EQ. 0) THEN
NATT = 1 NATT = 1
COUNT = COUNT/ATTEN(2) COUNT = COUNT/ATTEN(2)

2
difrac/cfind.f
View File

@ -18,7 +18,7 @@ C-----------------------------------------------------------------------
ICOUNT = 0 ICOUNT = 0
MCOUNT = 0 MCOUNT = 0
DO 120 I = 1,NPTS DO 120 I = 1,NPTS
CALL CTIME (TIM,TCOUNT(I)) CALL CCTIME (TIM,TCOUNT(I))
IF (TCOUNT(I)/TIM .GT. ICPSMX .AND. NATT .LT. NATTEN) THEN IF (TCOUNT(I)/TIM .GT. ICPSMX .AND. NATT .LT. NATTEN) THEN
NATT = NATT + 1 NATT = NATT + 1
GO TO 110 GO TO 110

4
difrac/comptn.f
View File

@ -44,7 +44,7 @@ C-----------------------------------------------------------------------
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C Sample count at point to find suitable counting time, then measure C Sample count at point to find suitable counting time, then measure
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
CALL CTIME (QTIME,ENQ) CALL CCTIME (QTIME,ENQ)
COUNT = ENQ COUNT = ENQ
ENQD = ENQ - 2.0*SQRT(ENQ) ENQD = ENQ - 2.0*SQRT(ENQ)
IF (ENQD .LE. 0.0) ENQD = ENQ IF (ENQD .LE. 0.0) ENQD = ENQ
@ -53,7 +53,7 @@ C-----------------------------------------------------------------------
IF (PRESET .GT. QTIME) THEN IF (PRESET .GT. QTIME) THEN
IF (PRESET .GT. PRESET) PRESET = TMAX IF (PRESET .GT. PRESET) PRESET = TMAX
TIMED = PRESET - QTIME TIMED = PRESET - QTIME
CALL CTIME (TIMED,EN) CALL CCTIME (TIMED,EN)
ELSE ELSE
PRESET = QTIME PRESET = QTIME
EN = 0 EN = 0

12
difrac/demo1e.f
View File

@ -12,7 +12,7 @@ C-----------------------------------------------------------------------
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C Move 2Theta C Move 2Theta
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
CALL CTIME (DELAY,COUNT) CALL CCTIME (DELAY,COUNT)
CALL ANGET (THETA,OMEGA,CHI,PHI) CALL ANGET (THETA,OMEGA,CHI,PHI)
THETA = THETA + 20.0 THETA = THETA + 20.0
CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL) CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
@ -21,7 +21,7 @@ C Move Omega
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
WRITE (COUT,11000) WRITE (COUT,11000)
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
CALL CTIME (DELAY,COUNT) CALL CCTIME (DELAY,COUNT)
OMEGA = OMEGA - 20.0 OMEGA = OMEGA - 20.0
CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL) CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
@ -29,7 +29,7 @@ C Move Chi
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
WRITE (COUT,12000) WRITE (COUT,12000)
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
CALL CTIME (DELAY,COUNT) CALL CCTIME (DELAY,COUNT)
CHI = CHI + 20.0 CHI = CHI + 20.0
IF (CHI .GE. 360.0) CHI = CHI - 360.0 IF (CHI .GE. 360.0) CHI = CHI - 360.0
CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL) CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
@ -38,7 +38,7 @@ C Move Phi
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
WRITE (COUT,13000) WRITE (COUT,13000)
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
CALL CTIME (DELAY,COUNT) CALL CCTIME (DELAY,COUNT)
PHI = PHI + 30.0 PHI = PHI + 30.0
IF (PHI .GE. 360.0) PHI = PHI - 360.0 IF (PHI .GE. 360.0) PHI = PHI - 360.0
CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL) CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
@ -47,7 +47,7 @@ C Move all circles
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
WRITE (COUT,14000) WRITE (COUT,14000)
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
CALL CTIME(DELAY,COUNT) CALL CCTIME(DELAY,COUNT)
THETA = THETA - 20.0 THETA = THETA - 20.0
OMEGA = OMEGA + 20.0 OMEGA = OMEGA + 20.0
CHI = CHI - 20.0 CHI = CHI - 20.0
@ -82,7 +82,7 @@ C-----------------------------------------------------------------------
DO 130 J = 1,100 DO 130 J = 1,100
DJUNK = SQRT(1.0) DJUNK = SQRT(1.0)
130 CONTINUE 130 CONTINUE
CALL CTIME (DELAY,COUNT) CALL CCTIME (DELAY,COUNT)
140 CONTINUE 140 CONTINUE
CALL SHUTTR (-1) CALL SHUTTR (-1)
C----------------------------------------------------------------------- C-----------------------------------------------------------------------

1
difrac/freefm.f
View File

@ -260,4 +260,3 @@ C-----------------------------------------------------------------------
14000 FORMAT (' TYPO -- Too many digits in number. Try again please.') 14000 FORMAT (' TYPO -- Too many digits in number. Try again please.')
15000 FORMAT (' Unexpected EOF on Unit',I3,'. Job Aborted.'/'%') 15000 FORMAT (' Unexpected EOF on Unit',I3,'. Job Aborted.'/'%')
END END


6
difrac/goloop.f
View File

@ -425,9 +425,9 @@ C------- modified: MK --> IO to SICS instead of LPT
RETURN RETURN
ENDIF ENDIF
10000 FORMAT (3I4,' Scan Collision in GOLOOP') 10000 FORMAT (3I4,' Scan Collision in GOLOOP')
11000 FORMAT (10X,A1'-stop. Restart at'/ 11000 FORMAT (10X,A1,'-stop. Restart at'/
$ 3I4,', number',I5,' in set',I3,' segment',I2, $ 3I4,', number',I5,' in set',I3,' segment',I2,
$ ' at Idata Record',I4) $ ' at Idata Record',I4)
12000 FORMAT (10X'End of Segment. Start next data at Record',I4) 12000 FORMAT (10X,'End of Segment. Start next data at Record',I4)
13000 FORMAT (10X'End of Data Collection ---- HURRAY !!') 13000 FORMAT (10X,'End of Data Collection ---- HURRAY !!')
END END

2
difrac/grid.f
View File

@ -145,7 +145,7 @@ C-----------------------------------------------------------------------
KI = ' ' KI = ' '
RETURN RETURN
ENDIF ENDIF
CALL CTIME (TIMSTP,COUNT) CALL CCTIME (TIMSTP,COUNT)
ICOUNT(N1) = COUNT ICOUNT(N1) = COUNT
ANG(IFIRST) = ANG(IFIRST) + ANSTEP(IFIRST) ANG(IFIRST) = ANG(IFIRST) + ANSTEP(IFIRST)
CALL MOD360 (ANG(IFIRST)) CALL MOD360 (ANG(IFIRST))

2
difrac/indmes.f
View File

@ -424,7 +424,7 @@ C-----------------------------------------------------------------------
ENDIF ENDIF
RETURN RETURN
10000 FORMAT (' Scan Collision') 10000 FORMAT (' Scan Collision')
11000 FORMAT (/,3X' h k l 2-Theta Time', 11000 FORMAT (/,3X, ' h k l 2-Theta Time',
$ ' Att Bkg Peak Bkg Psi Inet ') $ ' Att Bkg Peak Bkg Psi Inet ')
12000 FORMAT (3I4,F7.2,F7.3,1X,I1,I5,I7,I5,F7.2,I7,I4) 12000 FORMAT (3I4,F7.2,F7.3,1X,I1,I5,I7,I5,F7.2,I7,I4)
13000 FORMAT (3I4,5F8.2,I8) 13000 FORMAT (3I4,5F8.2,I8)

1
difrac/latmod.f
View File

@ -35,4 +35,3 @@ C-----------------------------------------------------------------------
RETURN RETURN
10000 FORMAT (A1) 10000 FORMAT (A1)
END END


4
difrac/linprf.f
View File

@ -72,7 +72,7 @@ C Loop to count and step through the reflection
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
CALL SHUTTR (99) CALL SHUTTR (99)
DO 240 J = 1,NPTS DO 240 J = 1,NPTS
CALL CTIME (TSTEP,COUNT) CALL CCTIME (TSTEP,COUNT)
ACOUNT(J) = COUNT ACOUNT(J) = COUNT
IF (ITYP .EQ. 0) ANG1 = ANG1 + CSTEP IF (ITYP .EQ. 0) ANG1 = ANG1 + CSTEP
IF (ITYP .NE. 0) ANG2 = ANG2 + CSTEP IF (ITYP .NE. 0) ANG2 = ANG2 + CSTEP
@ -135,7 +135,7 @@ C-----------------------------------------------------------------------
11000 FORMAT (' There is something WRONG. Please try again.') 11000 FORMAT (' There is something WRONG. Please try again.')
13000 FORMAT (' Scan type: Theta/2Theta or Omega, 0 or 1 ',$) 13000 FORMAT (' Scan type: Theta/2Theta or Omega, 0 or 1 ',$)
15000 FORMAT (' Type the no. of pts before & after the peak,' 15000 FORMAT (' Type the no. of pts before & after the peak,'
$ '(',I2,',',I2,') ',$) $ ,'(',I2,',',I2,') ',$)
15100 FORMAT (' Type the step size in degs and the preset/step', 15100 FORMAT (' Type the step size in degs and the preset/step',
$ ' (',F4.2,',',F4.2,') ',$) $ ' (',F4.2,',',F4.2,') ',$)
17000 FORMAT (' Which attenuator do you wish to use (0) ? ',$) 17000 FORMAT (' Which attenuator do you wish to use (0) ? ',$)

4
difrac/lister.f
View File

@ -202,8 +202,8 @@ C-----------------------------------------------------------------------
IF (ISYSF .EQ. 6) ISYSF = 5 IF (ISYSF .EQ. 6) ISYSF = 5
WRITE (COUT,15000) FSTRIN,STRING WRITE (COUT,15000) FSTRIN,STRING
15000 FORMAT (' Space-group choices are as follows :--'/ 15000 FORMAT (' Space-group choices are as follows :--'/
$ ' 1. The safest space-group based on cell-reduction 'A/ $ ' 1. The safest space-group based on cell-reduction ', A/
$ ' 2. The safest space-group based on cell lengths 'A/ $ ' 2. The safest space-group based on cell lengths ', A/
$ ' 3. Any other space-group.'/ $ ' 3. Any other space-group.'/
$ ' Which do you want (1) ',$) $ ' Which do you want (1) ',$)
16000 FORMAT (' Type the space-group symbol ',$) 16000 FORMAT (' Type the space-group symbol ',$)

2
difrac/lsormt.f
View File

@ -351,7 +351,7 @@ C-----------------------------------------------------------------------
23000 FORMAT (' Do you wish to insert reflections (N) ? ',$) 23000 FORMAT (' Do you wish to insert reflections (N) ? ',$)
24100 FORMAT (' Do you want to include these zero values (Y) ? ',$) 24100 FORMAT (' Do you want to include these zero values (Y) ? ',$)
24200 FORMAT (' The new zeroes for Omega and Chi are',2F7.3) 24200 FORMAT (' The new zeroes for Omega and Chi are',2F7.3)
24000 FORMAT (' First non-written record: 'I4) 24000 FORMAT (' First non-written record: ',I4)
25000 FORMAT (/,22X,'Observed',22X,'Calculated',10X,'Angular'/ 25000 FORMAT (/,22X,'Observed',22X,'Calculated',10X,'Angular'/
$ ' h k l 2Theta Omega Chi Phi ', $ ' h k l 2Theta Omega Chi Phi ',
$ ' 2Theta Omega Chi Phi ', $ ' 2Theta Omega Chi Phi ',

2
difrac/matrix.f
View File

@ -231,4 +231,4 @@ C-----------------------------------------------------------------------
520 RETURN 520 RETURN
10000 FORMAT(' Matrix operation ',A6,' is not programmed') 10000 FORMAT(' Matrix operation ',A6,' is not programmed')
END END


24
difrac/mesint.f
View File

@ -38,7 +38,7 @@ C-----------------------------------------------------------------------
PRESET = SPRESET PRESET = SPRESET
RETURN RETURN
ENDIF ENDIF
120 CALL CTIME (TTIME,COUNT) 120 CALL CCTIME (TTIME,COUNT)
IF (COUNT/TTIME .GE. ICPSMX) THEN IF (COUNT/TTIME .GE. ICPSMX) THEN
NATT = NATT + 1 NATT = NATT + 1
CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL) CALL ANGSET (THETA,OMEGA,CHI,PHI,NATT,ICOL)
@ -72,7 +72,7 @@ C-----------------------------------------------------------------------
C Measure the low angle background for BGDTIM C Measure the low angle background for BGDTIM
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
BGDTIM = FRAC*PRESET BGDTIM = FRAC*PRESET
CALL CTIME (BGDTIM,BGRD1) CALL CCTIME (BGDTIM,BGRD1)
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C Do the scan: C Do the scan:
C ITYPE Type of scan 0 -- theta/2-theta b-p-b C ITYPE Type of scan 0 -- theta/2-theta b-p-b
@ -202,7 +202,7 @@ C-----------------------------------------------------------------------
I = BGRD1*PRESET*FRAC/BGDTIM + 0.5 I = BGRD1*PRESET*FRAC/BGDTIM + 0.5
BGRD1 = I BGRD1 = I
BGDTIM = PRESET*FRAC BGDTIM = PRESET*FRAC
CALL CTIME (BGDTIM,BGRD2) CALL CCTIME (BGDTIM,BGRD2)
IF (BGRD1 + BGRD2 .GT. 4.0*COUNT) THEN IF (BGRD1 + BGRD2 .GT. 4.0*COUNT) THEN
WRITE (COUT,11000) IH,IK,IL WRITE (COUT,11000) IH,IK,IL
CALL GWRITE(ITP,' ') CALL GWRITE(ITP,' ')
@ -251,7 +251,7 @@ C-----------------------------------------------------------------------
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C Count at peak for time TIME C Count at peak for time TIME
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
420 CALL CTIME (PRESET,COUNT) 420 CALL CCTIME (PRESET,COUNT)
C C = COUNT/PRESET C C = COUNT/PRESET
IF (C .GE. ICPSMX .AND. NATTEN .GT. 0 .AND. NATT .LT. NATTEN) THEN IF (C .GE. ICPSMX .AND. NATTEN .GT. 0 .AND. NATT .LT. NATTEN) THEN
NATT = NATT + 1 NATT = NATT + 1
@ -271,9 +271,9 @@ C Measure the backgrounds
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
IF (ITYPE .EQ. 5 .OR. ITYPE .EQ. 6) THEN IF (ITYPE .EQ. 5 .OR. ITYPE .EQ. 6) THEN
BGDTIM = FRAC*PRESET BGDTIM = FRAC*PRESET
CALL CTIME (BGDTIM,BGRD2) CALL CCTIME (BGDTIM,BGRD2)
CALL ANGSET (ANG1,ANG2,CHI,PHI,NATT,ICOL) CALL ANGSET (ANG1,ANG2,CHI,PHI,NATT,ICOL)
CALL CTIME (BGDTIM,BGRD1) CALL CCTIME (BGDTIM,BGRD1)
IF (BGRD1 + BGRD2 .GT. 4.0*COUNT) THEN IF (BGRD1 + BGRD2 .GT. 4.0*COUNT) THEN
WRITE (COUT,11000) IH,IK,IL WRITE (COUT,11000) IH,IK,IL
CALL GWRITE(LPT,' ') CALL GWRITE(LPT,' ')
@ -287,7 +287,7 @@ C-----------------------------------------------------------------------
C Sample background on high side C Sample background on high side
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
PRESET = STIME*0.5 PRESET = STIME*0.5
CALL CTIME (PRESET,BGRD2) CALL CCTIME (PRESET,BGRD2)
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C Evaluate rough Peak/Background ratio and Time required to C Evaluate rough Peak/Background ratio and Time required to
C accumulate a preset number FRAC of counts on the peak. C accumulate a preset number FRAC of counts on the peak.
@ -308,7 +308,7 @@ C Finish measurement of high background
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
BCT = (IBCT - (STIME/2.0)) BCT = (IBCT - (STIME/2.0))
IF (BCT .GT. 0.) THEN IF (BCT .GT. 0.) THEN
CALL CTIME (BCT,BKG2) CALL CCTIME (BCT,BKG2)
BGRD2 = BGRD2 + BKG2 BGRD2 = BGRD2 + BKG2
BCT = IBCT BCT = IBCT
ICC = 0 ICC = 0
@ -327,7 +327,7 @@ C-----------------------------------------------------------------------
ENDIF ENDIF
PPCT = PCT PPCT = PCT
PCT = IPCT PCT = IPCT
CALL CTIME (PPCT,PC) CALL CCTIME (PPCT,PC)
COUNT = COUNT + PC COUNT = COUNT + PC
ELSE ELSE
PCT = STIME PCT = STIME
@ -341,7 +341,7 @@ C-----------------------------------------------------------------------
RETURN RETURN
ENDIF ENDIF
PRESET = BCT PRESET = BCT
CALL CTIME (PRESET,BGRD1) CALL CCTIME (PRESET,BGRD1)
PRESET = PCT + BCT PRESET = PCT + BCT
CALL FILLN2 (IFILN,NFLG) CALL FILLN2 (IFILN,NFLG)
IF (NFLG .EQ. 1) GO TO 100 IF (NFLG .EQ. 1) GO TO 100
@ -373,7 +373,7 @@ C-----------------------------------------------------------------------
WRITE (COUT,10000) WRITE (COUT,10000)
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
100 TIM1 = 1500 100 TIM1 = 1500
CALL CTIME (TIM1,CONT) CALL CCTIME (TIM1,CONT)
DUM1 = 1.0/16.0 DUM1 = 1.0/16.0
DUM2 = 0.5 DUM2 = 0.5
CALL ONEBEP (DUM1,DUM2) CALL ONEBEP (DUM1,DUM2)
@ -385,7 +385,7 @@ C-----------------------------------------------------------------------
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
TMIN = DELAY*6000 TMIN = DELAY*6000
IF (TMIN .LE. 1) TMIN = 1 IF (TMIN .LE. 1) TMIN = 1
CALL CTIME (TMIN,DUM2) CALL CCTIME (TMIN,DUM2)
IFILN = 1 IFILN = 1
NFLG = 1 NFLG = 1
ENDIF ENDIF

2
difrac/orcel2.f
View File

@ -241,7 +241,7 @@ C-----------------------------------------------------------------------
$ ' reflections') $ ' reflections')
24000 FORMAT (/' Orientation Matrix from M2') 24000 FORMAT (/' Orientation Matrix from M2')
25000 FORMAT (3F12.8) 25000 FORMAT (3F12.8)
26000 FORMAT (' Reflection,'I2,' > ',$) 26000 FORMAT (' Reflection,',I2,' > ',$)
END END
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C Subroutine to calculate the S matrices for ORCEL2 C Subroutine to calculate the S matrices for ORCEL2

2
difrac/oscil.f
View File

@ -69,7 +69,7 @@ C-----------------------------------------------------------------------
KI = ' ' KI = ' '
RETURN RETURN
ENDIF ENDIF
CALL CTIME (TISTEP,COUNT) CALL CCTIME (TISTEP,COUNT)
CALL KORQ (KQFLAG) CALL KORQ (KQFLAG)
IF (KQFLAG .NE. 1) THEN IF (KQFLAG .NE. 1) THEN
WRITE (COUT,15000) WRITE (COUT,15000)

8
difrac/pcount.f
View File

@ -49,7 +49,7 @@ C-----------------------------------------------------------------------
C Single count only C Single count only
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
IF (ANS .EQ. 'N') THEN IF (ANS .EQ. 'N') THEN
CALL CTIME (MPRESET,COUNT) CALL CCTIME (MPRESET,COUNT)
IF (NATTEN .NE. 0) THEN IF (NATTEN .NE. 0) THEN
WRITE (COUT,15000) MPRESET,NATT,COUNT WRITE (COUT,15000) MPRESET,NATT,COUNT
CALL GWRITE (ITP,' ') CALL GWRITE (ITP,' ')
@ -69,7 +69,7 @@ C-----------------------------------------------------------------------
110 CONTINUE 110 CONTINUE
BIGTIM = MPRESET * 5. BIGTIM = MPRESET * 5.
WRITE (LPT,17000) BIGTIM WRITE (LPT,17000) BIGTIM
CALL CTIME (BIGTIM,COUNT) CALL CCTIME (BIGTIM,COUNT)
COUNT = COUNT*MPRESET/BIGTIM COUNT = COUNT*MPRESET/BIGTIM
SIGM = SQRT(COUNT) SIGM = SQRT(COUNT)
AVC = COUNT + 0.5 AVC = COUNT + 0.5
@ -81,7 +81,7 @@ C-----------------------------------------------------------------------
WRITE (LPT,20000) WRITE (LPT,20000)
DO 150 N = 1,50 DO 150 N = 1,50
DO 120 I = 1,10 DO 120 I = 1,10
CALL CTIME (MPRESET,COUNT) CALL CCTIME (MPRESET,COUNT)
C(I) = COUNT C(I) = COUNT
120 CONTINUE 120 CONTINUE
DO 130 I = 1,10 DO 130 I = 1,10
@ -119,7 +119,7 @@ C-----------------------------------------------------------------------
CALL SHUTTR (-99) CALL SHUTTR (-99)
KI = ' ' KI = ' '
RETURN RETURN
10000 FORMAT (' Timed Count at a Point (Y) ? '$) 10000 FORMAT (' Timed Count at a Point (Y) ? ',$)
11000 FORMAT (' Type the Count Preset and the attenuator', 11000 FORMAT (' Type the Count Preset and the attenuator',
$ ' number (1000.0,0) ',$) $ ' number (1000.0,0) ',$)
12000 FORMAT (' Type the Count Preset (1000.0) ',$) 12000 FORMAT (' Type the Count Preset (1000.0) ',$)

2
difrac/pfind.f
View File

@ -29,7 +29,7 @@ C-----------------------------------------------------------------------
ICOUNT = 0 ICOUNT = 0
MCOUNT = 0 MCOUNT = 0
DO 110 I = 1,NPTS DO 110 I = 1,NPTS
CALL CTIME (TIM,PCOUNT(I)) CALL CCTIME (TIM,PCOUNT(I))
IF (PCOUNT(I) .GT. MCOUNT) THEN IF (PCOUNT(I) .GT. MCOUNT) THEN
MCOUNT = PCOUNT(I) MCOUNT = PCOUNT(I)
ICOUNT = I ICOUNT = I

8
difrac/prnbas.f
View File

@ -259,7 +259,7 @@ C-----------------------------------------------------------------------
22000 FORMAT (' There are NO Explicit Absence Conditions') 22000 FORMAT (' There are NO Explicit Absence Conditions')
23000 FORMAT (' The Explicit Absence Conditions are :--') 23000 FORMAT (' The Explicit Absence Conditions are :--')
24000 FORMAT (' Type',I3,' -- ', 24000 FORMAT (' Type',I3,' -- ',
$ I4,'*h +',I2,'*k +',I2,'*l = ',I2'*n +',I2) $ I4,'*h +',I2,'*k +',I2,'*l = ',I2,'*n +',I2)
30000 FORMAT (' Peak Top Counting - 2Theta range') 30000 FORMAT (' Peak Top Counting - 2Theta range')
31000 FORMAT (' Peak Top Counting - Omega range') 31000 FORMAT (' Peak Top Counting - Omega range')
32000 FORMAT (' Economized Peak Top - 2Theta range') 32000 FORMAT (' Economized Peak Top - 2Theta range')
@ -271,8 +271,8 @@ C-----------------------------------------------------------------------
29000 FORMAT (' Omega Scan with Precision Control. ',A, 29000 FORMAT (' Omega Scan with Precision Control. ',A,
$ 'rofile analysis.') $ 'rofile analysis.')
25000 FORMAT (' Compton or TDS Measurements') 25000 FORMAT (' Compton or TDS Measurements')
35000 FORMAT (' Bisecting Geometry. Scan speed 'F8.3'deg/min') 35000 FORMAT (' Bisecting Geometry. Scan speed ',F8.3,'deg/min')
34000 FORMAT (' Parallel Geometry. Scan speed 'F8.3'deg/min') 34000 FORMAT (' Parallel Geometry. Scan speed ',F8.3,'deg/min')
36000 FORMAT (' Scan Parameters: ', 36000 FORMAT (' Scan Parameters: ',
$ F6.3,' + ',F6.3,'*tan(theta) + ',F6.3) $ F6.3,' + ',F6.3,'*tan(theta) + ',F6.3)
37000 FORMAT (' Time/Precision Params: ', 37000 FORMAT (' Time/Precision Params: ',
@ -285,5 +285,5 @@ C-----------------------------------------------------------------------
43000 FORMAT (' Next reflection: ',3I4,', #',I5,', set',I3, 43000 FORMAT (' Next reflection: ',3I4,', #',I5,', set',I3,
$ ', segment',I2,', at record ',I4) $ ', segment',I2,', at record ',I4)
44000 FORMAT (' This is a low-temperature experiment.'/ 44000 FORMAT (' This is a low-temperature experiment.'/
$ ' The waiting time after a refill is'F6.2' minutes.') $ ' The waiting time after a refill is',F6.2,' minutes.')
END END

2
difrac/prnint.f
View File

@ -240,7 +240,7 @@ C-----------------------------------------------------------------------
13000 FORMAT (' Type 2thetamin ',$) 13000 FORMAT (' Type 2thetamin ',$)
14000 FORMAT (/' Reflns can be selected on 2theta and Inet/Sig(Inet)'/ 14000 FORMAT (/' Reflns can be selected on 2theta and Inet/Sig(Inet)'/
$ ' Type 2thetamin, 2thetamax and min(I/sigI)', $ ' Type 2thetamin, 2thetamax and min(I/sigI)',
$ ' (All Reflns) '$) $ ' (All Reflns) ',$)
15000 FORMAT (' Intensity data is in records 20 to',I5/ 15000 FORMAT (' Intensity data is in records 20 to',I5/
$ ' Type the range of records to be examined ',$) $ ' Type the range of records to be examined ',$)
16000 FORMAT (/' Records',I4,' to',I4,' will be used.') 16000 FORMAT (/' Records',I4,' to',I4,' will be used.')

1
difrac/sgerrs.f
View File

@ -38,4 +38,3 @@ C-----------------------------------------------------------------------
10000 FORMAT (' Error no.',I3,' in processing space group symbol ', 10000 FORMAT (' Error no.',I3,' in processing space group symbol ',
$ 10A1/1X,A52) $ 10A1/1X,A52)
END END


1
difrac/sglatc.f
View File

@ -654,4 +654,3 @@ C-----------------------------------------------------------------------
IF (IER .EQ. 0) IER = 5 IF (IER .EQ. 0) IER = 5
RETURN RETURN
END END


1
difrac/sglpak.f
View File

@ -9,4 +9,3 @@ C-----------------------------------------------------------------------
L(2) = 3 L(2) = 3
RETURN RETURN
END END


1
difrac/sgmtml.f
View File

@ -21,4 +21,3 @@ C-----------------------------------------------------------------------
CONTINUE CONTINUE
RETURN RETURN
END END


1
difrac/sgprnh.f
View File

@ -123,4 +123,3 @@ C-----------------------------------------------------------------------
14000 FORMAT (' Friedel Reflections are the -,-,- of these.'/'%') 14000 FORMAT (' Friedel Reflections are the -,-,- of these.'/'%')
15000 FORMAT (5X,3(A20,3X)) 15000 FORMAT (5X,3(A20,3X))
END END


1
difrac/sgrmat.f
View File

@ -28,4 +28,3 @@ C-----------------------------------------------------------------------
RT(5,4) = 20. RT(5,4) = 20.
RETURN RETURN
END END


1
difrac/sgroup.f
View File

@ -559,4 +559,3 @@ C-----------------------------------------------------------------------
RETURN RETURN
10000 FORMAT (10A1) 10000 FORMAT (10A1)
END END


1
difrac/sgtrcf.f
View File

@ -66,4 +66,3 @@ C-----------------------------------------------------------------------
11000 FORMAT (' Operator',I2,' generates matrix',I3,' which has a', 11000 FORMAT (' Operator',I2,' generates matrix',I3,' which has a',
$ ' translation conflict',2I3) $ ' translation conflict',2I3)
END END


2
difrac/tcentr.f
View File

@ -182,7 +182,7 @@ C Position on the peak and count for standard preset
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
CALL ANGSET (RTHETA,ROMEGA,RCHI,RPHI,NATT,ICOL) CALL ANGSET (RTHETA,ROMEGA,RCHI,RPHI,NATT,ICOL)
CALL SHUTTR (99) CALL SHUTTR (99)
CALL CTIME (PRESET,COUNT) CALL CCTIME (PRESET,COUNT)
ICOUNT = COUNT ICOUNT = COUNT
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C Do not save a weak count C Do not save a weak count

2
difrac/tfind.f
View File

@ -16,7 +16,7 @@ C-----------------------------------------------------------------------
ICOUNT = 0 ICOUNT = 0
MCOUNT = 0 MCOUNT = 0
DO 110 I = 1,NPTS DO 110 I = 1,NPTS
CALL CTIME (TIM,TCOUNT(I)) CALL CCTIME (TIM,TCOUNT(I))
IF (TCOUNT(I) .GT. MCOUNT) THEN IF (TCOUNT(I) .GT. MCOUNT) THEN
MCOUNT = TCOUNT(I) MCOUNT = TCOUNT(I)
ICOUNT = I ICOUNT = I

8
difrac/trics.f
View File

@ -35,7 +35,7 @@ C-----------------------------------------------------------------------
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
C CTIME Count for a fixed time C CTIME Count for a fixed time
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
SUBROUTINE CTIME (XTIME, XCOUNT) SUBROUTINE CCTIME (XTIME, XCOUNT)
REAL XTIME, XCOUNT REAL XTIME, XCOUNT
INCLUDE 'COMDIF' INCLUDE 'COMDIF'
call setslt (icadsl,icol) call setslt (icadsl,icol)
@ -234,7 +234,7 @@ C----- position
RETURN RETURN
ENDIF ENDIF
C----- count C----- count
CALL CTIME(PRESET,COUNT) CALL CCTIME(PRESET,COUNT)
CALL KORQ(IT) CALL KORQ(IT)
IF(IT .NE. 1)THEN IF(IT .NE. 1)THEN
IERR = 2 IERR = 2
@ -295,7 +295,7 @@ C----- position
RETURN RETURN
ENDIF ENDIF
C----- count C----- count
CALL CTIME(SPRESET,COUNT) CALL CCTIME(SPRESET,COUNT)
CALL KORQ(IT) CALL KORQ(IT)
IF(IT .NE. 1)THEN IF(IT .NE. 1)THEN
IERR = 2 IERR = 2
@ -341,7 +341,7 @@ C-----------------------------------------------------------------------
C Set the microscope viewing position (CAD-4 version) C Set the microscope viewing position (CAD-4 version)
C----------------------------------------------------------------------- C-----------------------------------------------------------------------
SUBROUTINE VUPOS (VTH,VOM,VCH,VPH) SUBROUTINE VUPOS (VTH,VOM,VCH,VPH)
CALL ANGSET(VTH,VOM,VCH,VPH) CALL ANGSET(VTH,VOM,VCH,VPH,1,1)
RETURN RETURN
END END

11
hardsup/Makefile
View File

@ -3,15 +3,20 @@
# #
# Mark Koennecke, November 1996 # Mark Koennecke, November 1996
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
CC=cc #CC=cc
#CC= gcc CC= gcc
OBJ= el734_utility.o asynsrv_utility.o stredit.o \ OBJ= el734_utility.o asynsrv_utility.o stredit.o \
strjoin.o geterrno.o el737_utility.o sinqhm.o serialsinq.o \ strjoin.o geterrno.o el737_utility.o sinqhm.o serialsinq.o \
itc4util.o dillutil.o table.o el755_utility.o el755_errorlog.o \ itc4util.o dillutil.o table.o el755_utility.o el755_errorlog.o \
makeprint.o makeprint.o
CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c #---------- for Redhat linux
CFLAGS= -I/usr/local/include -I. -I../ -DLINUX -g -c
#------------ for DigitalUnix
#CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c
#------------ for DigitalUnix with Fortify
#CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../ -std1 -g -c #CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../ -std1 -g -c
#------------ for CYGNUS toolchain on Win32
#CFLAGS= -I. -I../ -DCYGNUS -g -c #CFLAGS= -I. -I../ -DCYGNUS -g -c
.c.o: .c.o:
$(CC) $(CFLAGS) $*.c $(CC) $(CFLAGS) $*.c

6
hardsup/el734_utility.c
View File

@ -676,7 +676,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef LINUX
#include <timers.h> #include <timers.h>
#endif
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <netdb.h> #include <netdb.h>
@ -2135,6 +2137,10 @@ char cILLGText[256];
int *fp_cntr, int *fp_cntr,
int *fr_cntr, int *fr_cntr,
float *ist_posit) { float *ist_posit) {
#ifdef LINUX
#define nanosleep_d9 nanosleep
#endif
#ifdef __VMS #ifdef __VMS
#include <lib$routines.h> #include <lib$routines.h>
#define hibernate lib$wait (0.25) #define hibernate lib$wait (0.25)

5
hardsup/el737_utility.c
View File

@ -500,7 +500,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef LINUX
#include <timers.h> #include <timers.h>
#endif
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <netdb.h> #include <netdb.h>
@ -1444,6 +1446,9 @@
int *c3, int *c3,
int *c4, int *c4,
float *timer) { float *timer) {
#ifdef LINUX
#define nanosleep_d9 nanosleep
#endif
#ifdef __VMS #ifdef __VMS
#include <lib$routines.h> #include <lib$routines.h>
#define hibernate lib$wait (0.25) #define hibernate lib$wait (0.25)

5
hardsup/sinqhm.c
View File

@ -55,7 +55,10 @@
#include "sinqhm.h" #include "sinqhm.h"
#include "sinqhm.i" #include "sinqhm.i"
/* missing in cygnus network stuff?? */ /* missing in cygnus and linux network stuff?? */
#ifdef LINUX
#define CYGNUS
#endif
#ifdef CYGNUS #ifdef CYGNUS
#define MSG_WAITALL 0 #define MSG_WAITALL 0
#endif #endif

25
nintf.c Normal file
View File

@ -0,0 +1,25 @@
/*----------------------------------------------------------------------
Some systems, such as linux, miss nintf in the math library. This
is an implementation.
Mark Koennecke, February 2000
---------------------------------------------------------------------------*/
#include <math.h>
float nintf(float f)
{
double ip, rm;
float fRes;
rm = modf(f,&ip);
if(rm < .0)rm = -rm;
if(rm > .5)
{
if(ip < .0)
ip -= 1.;
else
ip += 1.;
}
return (float) ip;
}

4
nserver.c
View File

@ -424,7 +424,7 @@
tNow = time(NULL); tNow = time(NULL);
sWait.tFinish = tNow + (time_t)fVal; sWait.tFinish = tNow + (time_t)fVal;
sWait.iEnd = 0; sWait.iEnd = 0;
lID = TaskRegister(pTask,WaitTask,WaitSignal,free,&sWait,1); lID = TaskRegister(pTask,WaitTask,WaitSignal,NULL,&sWait,1);
TaskWait(pTask,lID); TaskWait(pTask,lID);
SetStatus(eOld); SetStatus(eOld);
return i; return i;
@ -441,7 +441,7 @@
tNow = time(NULL); tNow = time(NULL);
sWait.tFinish = tNow + lTime; sWait.tFinish = tNow + lTime;
sWait.iEnd = 0; sWait.iEnd = 0;
lID = TaskRegister(pTasker,WaitTask,WaitSignal,free,&sWait,1); lID = TaskRegister(pTasker,WaitTask,WaitSignal,NULL,&sWait,1);
TaskWait(pTasker,lID); TaskWait(pTasker,lID);
return 1; return 1;
} }

6
sicsstatus.tcl
View File

@ -1,7 +1,7 @@
# RuenBuffer wuerg # RuenBuffer wuerg
Buf new wuerg Buf new wuerg
hm CountMode timer hm CountMode timer
hm preset 200.000000 hm preset 2.000000
hm genbin 120.000000 35.000000 512 hm genbin 120.000000 35.000000 512
hm init hm init
datafile focus-1001848.hdf datafile focus-1001848.hdf
@ -122,7 +122,7 @@ phone setAccess 2
adress UNKNOWN adress UNKNOWN
adress setAccess 2 adress setAccess 2
# Counter counter # Counter counter
counter SetPreset 2.000000 counter SetPreset 0.500000
counter SetMode Timer counter SetMode Timer
# Motor som # Motor som
som SoftZero 0.000000 som SoftZero 0.000000
@ -364,5 +364,5 @@ sample Bi2212 #1, th vs SGU=-12.5
sample setAccess 2 sample setAccess 2
title TopsiTupsiTapsi title TopsiTupsiTapsi
title setAccess 2 title setAccess 2
starttime 1999-12-16 14:43:50 starttime 2000-02-18 16:40:55
starttime setAccess 2 starttime setAccess 2

5
task.c
View File

@ -70,7 +70,10 @@
if(self->pKill) if(self->pKill)
{ {
self->pKill(self->pData); if(self->pData)
{
self->pKill(self->pData);
}
} }
/* unlink */ /* unlink */
if(self->pPrevious != NULL) if(self->pPrevious != NULL)

6
tcl/topsicom.tcl
View File

@ -5,9 +5,9 @@
# Mark Koennecke, October 1997 # Mark Koennecke, October 1997
# Requires a sics scan command called xxxscan # Requires a sics scan command called xxxscan
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
set home /data/koenneck/src/sics/tcl set home /home/koenneck/sics/tcl
set datapath /data/koenneck/tmp set datapath /home/koenneck/tmp
set recoverfil /data/koenneck/tmp/recover.bin set recoverfil /home/koenneck/tmp/recover.bin
source $home/utils.tcl source $home/utils.tcl

29
test.tcl
View File

@ -9,6 +9,9 @@
rename scan stscan rename scan stscan
#-------- a home for this, everything else is in relation to this
set shome /home/koenneck
#set auto_path "/data/koenneck/src/sics/tcl" #set auto_path "/data/koenneck/src/sics/tcl"
#source $auto_path/tcl8/topsicom.tcl #source $auto_path/tcl8/topsicom.tcl
@ -27,10 +30,10 @@ ServerOption ReadUserPasswdTimeout 7000
# time to wiat for a user/passwd to be sent from a client. Increase this # time to wiat for a user/passwd to be sent from a client. Increase this
# if there is a problem connecting to a server due to network overload\ # if there is a problem connecting to a server due to network overload\
ServerOption LogFileDir /data/koenneck/log ServerOption LogFileDir $shome/log
#LogFileDir is the directory where the command log is going #LogFileDir is the directory where the command log is going
ServerOption LogFileBaseName /data/koenneck/src/sics/tmp/server ServerOption LogFileBaseName $shome/sics/tmp/server
# the path and base name of the internal server logfile to which all # the path and base name of the internal server logfile to which all
# activity will be logged. # activity will be logged.
@ -48,7 +51,7 @@ ServerOption InterruptPort 2914
ServerOption TelnetPort 1301 ServerOption TelnetPort 1301
ServerOption TelWord sicslogin ServerOption TelWord sicslogin
ServerOption DefaultTclDirectory /data/koenneck/src/sics/tcl ServerOption DefaultTclDirectory $shome/sics/tcl
ServerOption DefaultCommandFile topsicom.tcl ServerOption DefaultCommandFile topsicom.tcl
#------ a port for broadcasting UDP messages #------ a port for broadcasting UDP messages
@ -188,7 +191,7 @@ Publish LogBook Spy
MakeRuenBuffer MakeRuenBuffer
#---------------- TestVariables for Storage #---------------- TestVariables for Storage
VarMake SicsDataPath Text Mugger VarMake SicsDataPath Text Mugger
SicsDataPath "/data/koenneck/src/sics/" SicsDataPath "$shome/sics/"
SicsDataPath lock SicsDataPath lock
VarMake SicsDataPrefix Text Mugger VarMake SicsDataPrefix Text Mugger
SicsDataPrefix test SicsDataPrefix test
@ -203,8 +206,8 @@ VarMake fax Text User
VarMake email Text User VarMake email Text User
VarMake sample_mur Float User VarMake sample_mur Float User
MakeDataNumber SicsDataNumber "/data/koenneck/src/sics/danu.dat" MakeDataNumber SicsDataNumber "$shome/sics/danu.dat"
InitSANS /data/koenneck/src/sics/sansdict.dic InitSANS $shome/sics/sansdict.dic
#InitDMC #InitDMC
MakeScanCommand xxxscan counter topsi.hdd recover.bin MakeScanCommand xxxscan counter topsi.hdd recover.bin
@ -227,15 +230,15 @@ banana CountMode Timer
#banana configure Counter counter #banana configure Counter counter
banana init banana init
ClientPut "HM initialized" ClientPut "HM initialized"
source /data/koenneck/src/sics/tcl/topsicom.tcl source $shome/sics/tcl/topsicom.tcl
source /data/koenneck/src/sics/countf.tcl source $shome/sics/countf.tcl
Publish count User Publish count User
Publish repeat user Publish repeat user
source /data/koenneck/src/sics/tcl/cscan.tcl source $shome/sics/tcl/cscan.tcl
Publish cscan User Publish cscan User
Publish sscan User Publish sscan User
Publish sftime Spy Publish sftime Spy
source /data/koenneck/src/sics/tcl/fit.tcl source $shome/sics/tcl/fit.tcl
Publish fit Spy Publish fit Spy
SerialInit SerialInit
Publish serialport User Publish serialport User
@ -275,7 +278,7 @@ HKL setub -0.1247023 0.0016176 -0.0413566 \
-0.1044479 -0.0013264 0.0493878 \ -0.1044479 -0.0013264 0.0493878 \
0.0007513 0.0840941 0.0015745 0.0007513 0.0840941 0.0015745
MakeOptimise opti counter MakeOptimise opti counter
MakeMesure mess HKL xxxscan omega o2t /data/koenneck/src/sics/tmp \ MakeMesure mess HKL xxxscan omega o2t $shome/sics/tmp \
SicsDataNumber SicsDataNumber
MakeHklscan xxxscan HKL MakeHklscan xxxscan HKL
@ -367,9 +370,9 @@ Publish co User
source helium.tcl source helium.tcl
MakeTRICSNEXUS sicsdatanumber /data/koenneck/src/sics/tmp trics.dic MakeTRICSNEXUS sicsdatanumber $shome/sics/tmp trics.dic
source autofile.tcl source autofile.tcl
autofilepath /data/koenneck/tmp/auto autofilepath $shome/tmp/auto
MakeXYTable omth MakeXYTable omth