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

- Funny things with header files...

Browse Source 
SKIPPED:
	psi/dornier2.c
	psi/makefile_linux
This commit is contained in:
cvs
2003-12-10 15:32:42 +00:00
parent bc02cb79e7
commit 350a5ad063
8 changed files with 102 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
conman.h
View File

@ -22,6 +22,9 @@
#define MAXLOGFILES 10 #define MAXLOGFILES 10
typedef int (*writeFunc)(struct __SConnection *pCon,
char *pMessage, int iCode);
typedef struct __SConnection { typedef struct __SConnection {
/* object basics */ /* object basics */
pObjectDescriptor pDes; pObjectDescriptor pDes;
@ -35,8 +38,7 @@
int iTelnet; int iTelnet;
int iOutput; int iOutput;
int iFiles; int iFiles;
int (*write)(struct __SConnection *pCon, writeFunc write;
char *pMessage, int iCode);
mkChannel *pDataSock; mkChannel *pDataSock;
char *pDataComp; char *pDataComp;
int iDataPort; int iDataPort;
@ -45,11 +47,12 @@
int eInterrupt; int eInterrupt;
int iUserRights; int iUserRights;
int inUse; int inUse;
int iDummy;
int iGrab; int iGrab;
int iErrCode;
SicsInterp *pSics; SicsInterp *pSics;
/* flag for parameter change */
int parameterChange;
/* a FIFO */ /* a FIFO */
pCosta pStack; pCosta pStack;
@ -58,6 +61,12 @@
/* Tasking Stuff */ /* Tasking Stuff */
int iEnd; int iEnd;
/* for keeping track of the login
process on a non telnet connection.
Should only be used in SCTaskFunction
*/
int iLogin;
time_t conStart;
}SConnection; }SConnection;
#include "nserver.h" #include "nserver.h"
@ -81,26 +90,32 @@
int SCSendOK(SConnection *self); int SCSendOK(SConnection *self);
int SCnoSock(SConnection *pCon); int SCnoSock(SConnection *pCon);
int SCWriteUUencoded(SConnection *pCon, char *pName, void *iData, int iLen); int SCWriteUUencoded(SConnection *pCon, char *pName, void *iData, int iLen);
int SCWriteZipped(SConnection *pCon, char *pName, void *pData, int iDataLen);
writeFunc SCGetWriteFunc(SConnection *pCon);
void SCSetWriteFunc(SConnection *pCon, writeFunc x);
int SCOnlySockWrite(SConnection *self, char *buffer, int iOut);
int SCNotWrite(SConnection *self, char *buffer, int iOut);
/************************* CallBack *********************************** */ /************************* CallBack *********************************** */
int SCRegister(SConnection *pCon, SicsInterp *pSics, int SCRegister(SConnection *pCon, SicsInterp *pSics,
void *pInter, long lID); void *pInter, long lID);
int SCUnregister(SConnection *pCon, void *pInter); int SCUnregister(SConnection *pCon, void *pInter);
/******************************* Error **************************************/ /******************************* Interrupt *********************************/
void SCSetInterrupt(SConnection *self, int eCode); void SCSetInterrupt(SConnection *self, int eCode);
int SCGetInterrupt(SConnection *self); int SCGetInterrupt(SConnection *self);
void SCSetError(SConnection *pCon, int iCode);
int SCGetError(SConnection *pCon);
/****************************** Macro ***************************************/ /****************************** Macro ***************************************/
int SCinMacro(SConnection *pCon); int SCinMacro(SConnection *pCon);
int SCsetMacro(SConnection *pCon, int iMode); int SCsetMacro(SConnection *pCon, int iMode);
/************************** parameters changed ? **************************/
void SCparChange(SConnection *pCon);
/* *************************** Info *************************************** */ /* *************************** Info *************************************** */
int SCGetRights(SConnection *self); int SCGetRights(SConnection *self);
int SCSetRights(SConnection *pCon, int iNew); int SCSetRights(SConnection *pCon, int iNew);
int SCMatchRights(SConnection *pCon, int iCode); int SCMatchRights(SConnection *pCon, int iCode);
int SCGetOutClass(SConnection *self); int SCGetOutClass(SConnection *self);
int SCGetGrab(SConnection *pCon); int SCGetGrab(SConnection *pCon);
/********************* simulation mode ************************************/
void SCSetSimMode(SConnection *pCon, int value);
int SCinSimMode(SConnection *pCon);
/* **************************** Invocation ******************************** */ /* **************************** Invocation ******************************** */
int SCInvoke(SConnection *self,SicsInterp *pInter,char *pCommand); int SCInvoke(SConnection *self,SicsInterp *pInter,char *pCommand);

232
emergency.dat
View File

@ -1,187 +1,45 @@
*************************** TOPSI Data File ******************************** RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR
Title = TopsiTupsiTapsi 0 1 0
User = Daniel_the_Clementine ILL TAS data in the new ASCII format follow after the line VV...V
File Creation Stardate: 1999-11-08 09:44:59 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
**************************************************************************** 42 0
Monochromator Lamda = 5.321338 SIMTAS oksana 06-Nov-2003 09:12:43
Monochromator A1 = 52.500000 VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
Monochromator A2 = 105.000000 INSTR: SIMTAS
---------------------------------------------------------------------------- EXPNO:
Sample STL = 30.000000 USER_: oksana
Sample STU = 30.000000 LOCAL: roessli
Sample SGL = 20.000000 FILE_: 0
Sample SGU = -12.500000 DATE_: 06-Nov-2003 09:12:43
**************************** DATA ****************************************** TITLE: ceb6
Scanning Variables: th, COMND: sc qh 0.90 0.90 0.90 2.25 dqh 0 0 0 0.1 np 15 mn 120000
237 Points, Mode: Timer, Preset 1.000000 POSQE: QH= 0.9000, QK= 0.9000, QL= 0.9000, EN= 2.2500, UN=MEV
NP th Counts Monitor1 Monitor2 Monitor3 Time STEPS: DQH= 0.0000, DQK= 0.0000, DQL= 0.0000, DEN= 0.1000,
0 -59.000 8967 2203 10317 -1 2.0 PARAM: DM= 3.3540, DA= 3.3540, SM=-1, SS= 1, SA=-1
1 -58.500 24367 11758 8524 -1 2.0 PARAM: FX= 2, KFIX= 1.5000
2 -58.000 2455 520 23410 -1 2.0 PARAM: ALF1=800.0000, ALF2= 80.0000, ALF3=800.0000, ALF4=800.0000
3 -57.500 16845 16818 4483 -1 2.0 PARAM: BET1=400.0000, BET2=400.0000, BET3=400.0000, BET4=400.0000
4 -57.000 12219 9072 11783 -1 2.0 PARAM: ETAM= 15.0000, ETAA= 30.0000
5 -56.500 28352 27019 19294 -1 2.0 PARAM: AS= 4.1400, BS= 4.1400, CS= 4.1400
6 -56.000 29441 29823 15374 -1 2.0 PARAM: AA= 90.0000, BB= 90.0000, CC= 90.0000
7 -55.500 3482 23668 8995 -1 2.0 PARAM: AX= 1.0000, AY= 1.0000, AZ= 0.0000
8 -55.000 7653 21770 6216 -1 2.0 PARAM: BX= 0.0000, BY= 0.0000, BZ= 1.0000
9 -54.500 22414 206 3127 -1 2.0 VARIA: A1 = 46.6390, A2 = 53.8900, A3 =-50.6720,
10 -54.000 22308 13424 15312 -1 2.0 VARIA: A4 =129.7100, A5 =112.5900, A6 =141.0470,
11 -53.500 31961 24537 14256 -1 2.0 VARIA: MCV = 66.4000, SRO =175.5000, ACH = 6.0000,
12 -53.000 18488 18078 2742 -1 2.0 VARIA: MTL = 17.0000, MTU = 18.8000, STL = 30.0000,
13 -52.500 14057 23799 3926 -1 2.0 VARIA: STU = 30.0000, STL = 30.0000, ATU = 16.9400,
14 -52.000 18097 2806 9211 -1 2.0 VARIA: MGL = 10.0000, SGL = 16.0000, SGU = 16.0000,
15 -51.500 28233 25260 13072 -1 2.0 VARIA: AGL = 10.0000, ATL = 17.0000, TT = 39.4383,
16 -51.000 21618 26521 10543 -1 2.0 VARIA: I1 =-999.9900, I2 =-999.9900, I3 =-999.9900,
17 -50.500 5095 12725 21073 -1 2.0 ZEROS: A1 = 0.0890, A2 = 0.3400, A3 =-227.9720,
18 -50.000 32440 21399 7314 -1 2.0 ZEROS: A4 = 0.4600, A5 =-87.4100, A6 = 0.0470,
19 -49.500 6996 25072 18849 -1 2.0 ZEROS: MCV = -0.1000, SRO = -0.0000, ACH = -0.0000,
20 -49.000 31303 6051 3042 -1 2.0 ZEROS: MTL = -0.0000, MTU = 1.8000, STL = -0.0000,
21 -48.500 27013 13357 20680 -1 2.0 ZEROS: STU = -0.0000, STL = -0.0000, ATU = -0.0000,
22 -48.000 14947 28958 22289 -1 2.0 ZEROS: MGL = -0.0000, SGL = -0.0000, SGU = -0.0000,
23 -47.500 29783 24413 7797 -1 2.0 ZEROS: AGL = -0.0000, ATL = -0.0000,
24 -47.000 26747 15699 25531 -1 2.0 PARAM: MN=120000.000000
25 -46.500 12336 2208 20547 -1 2.0 FORMT: (I4,1X,F9.4,1X,F9.4,1X,F9.4,1X,F9.4,1X,F8.0,1X,F8.0,1X,F9.2,1X,F8.0,1X,F8.0,1X,F9.4,1X,F9.4,1X,F9.4,1X,F9.4)
26 -46.000 19676 21318 26255 -1 2.0 DATA_:
27 -45.500 20815 19049 23542 -1 2.0 PNT QH QK QL EN M1 M2 TIME CNTS M3 A2 A3 A4 TT
28 -45.000 16255 22528 30097 -1 2.0
29 -44.500 23663 17143 23994 -1 2.0
30 -44.000 447 23307 26391 -1 2.0
31 -43.500 61 4986 32302 -1 2.0
32 -43.000 725 25244 26342 -1 2.0
33 -42.500 11437 11039 14620 -1 2.0
34 -42.000 18858 22070 9507 -1 2.0
35 -41.500 329 15969 15174 -1 2.0
36 -41.000 7289 19423 18739 -1 2.0
37 -40.500 8959 9184 27569 -1 2.0
38 -40.000 4456 6701 899 -1 2.0
39 -39.500 11317 29003 14210 -1 2.0
40 -39.000 22539 10217 8882 -1 2.0
41 -38.500 31787 15015 9555 -1 2.0
42 -38.000 20965 16300 18351 -1 2.0
43 -37.500 7782 26149 19653 -1 2.0
44 -37.000 5106 164 16266 -1 2.0
45 -37.500 31404 197 25099 -1 2.0
46 -36.000 10518 28778 24342 -1 2.0
47 -35.500 32571 15848 20934 -1 2.0
48 -35.000 22802 21241 4339 -1 2.0
49 -34.500 23764 16205 21089 -1 2.0
50 -34.000 4053 9211 18542 -1 2.0
51 -33.500 14949 5395 9089 -1 2.0
52 -33.000 16281 25424 19573 -1 2.0
53 -32.500 978 27620 7378 -1 2.0
54 -32.000 10248 24563 20563 -1 2.0
55 -31.500 2236 15305 6143 -1 2.0
56 -31.000 13120 3545 2625 -1 2.0
57 -30.500 4537 3687 17839 -1 2.0
58 -30.000 2266 15530 24194 -1 2.0
59 -29.500 3456 20267 3096 -1 2.0
60 -29.000 11541 32236 5092 -1 2.0
61 -28.500 6980 20951 7388 -1 2.0
62 -28.000 22631 2493 11540 -1 2.0
63 -27.500 16811 11356 7860 -1 2.0
64 -27.000 6930 17529 16204 -1 2.0
65 -26.500 11038 282 17728 -1 2.0
66 -26.000 20100 25974 555 -1 2.0
67 -25.500 30249 3996 7380 -1 2.0
68 -25.000 28588 5663 12665 -1 2.0
69 -24.500 13425 3290 13412 -1 2.0
70 -24.000 4138 22752 10315 -1 2.0
71 -23.500 28412 22392 29737 -1 2.0
72 -23.000 18525 1627 2157 -1 2.0
73 -22.500 27074 27983 8105 -1 2.0
74 -22.000 3380 16856 12275 -1 2.0
75 -21.500 4915 24006 25568 -1 2.0
76 -21.000 20292 31432 26115 -1 2.0
77 -20.500 17069 18090 23943 -1 2.0
78 -20.000 2399 10997 29689 -1 2.0
79 -19.500 10180 32626 12604 -1 2.0
80 -19.000 7473 742 19456 -1 2.0
81 -18.500 1286 26046 20661 -1 2.0
82 -18.000 27396 6856 26963 -1 2.0
83 -18.500 7143 22820 6703 -1 2.0
84 -17.000 13604 21180 9791 -1 2.0
85 -16.500 27401 23433 14650 -1 2.0
86 -16.000 7216 22059 1067 -1 2.0
87 -15.500 14771 20933 6550 -1 2.0
88 -15.000 30580 30932 8549 -1 2.0
89 -14.500 3837 32065 12476 -1 2.0
90 -14.000 27580 9840 29148 -1 2.0
91 -13.500 18736 25441 17455 -1 2.0
92 -13.000 10307 3555 19345 -1 2.0
93 -12.500 22085 5448 10997 -1 2.0
94 -12.000 23104 4689 20380 -1 2.0
95 -11.500 28275 946 16402 -1 2.0
96 -11.000 2765 31198 12550 -1 2.0
97 -10.500 20287 18196 18437 -1 2.0
98 -10.000 31076 27146 13449 -1 2.0
99 -9.500 28128 18678 5336 -1 2.0
100 -9.000 22690 23550 25646 -1 2.0
101 -8.500 9440 17697 7736 -1 2.0
102 -8.000 23979 10751 23454 -1 2.0
103 -7.500 24646 13443 7229 -1 2.0
104 -7.000 12236 29309 22210 -1 2.0
105 -6.500 1978 30473 12315 -1 2.0
106 -6.000 25529 9575 22042 -1 2.0
107 -5.500 5510 21070 14813 -1 2.0
108 -5.000 10715 9672 15845 -1 2.0
109 -4.500 8664 13059 9118 -1 2.0
110 -4.000 10959 3201 31106 -1 2.0
111 -3.500 9995 22587 18352 -1 2.0
112 -3.000 20850 475 30334 -1 2.0
113 -2.500 30093 11040 23411 -1 2.0
114 -2.000 13119 25138 18651 -1 2.0
115 -1.500 4971 4297 11160 -1 2.0
116 -1.000 8726 3183 31489 -1 2.0
117 -0.500 18446 21037 19501 -1 2.0
118 0.000 9062 32379 29094 -1 2.0
119 0.500 11737 30969 32729 -1 2.0
120 1.000 20493 6427 30256 -1 2.0
121 1.500 6626 26327 5231 -1 2.0
122 2.000 17959 24455 10201 -1 2.0
123 2.500 1690 6872 26058 -1 2.0
124 3.000 1428 8842 30822 -1 2.0
125 3.500 20391 15793 233 -1 2.0
126 4.000 27505 2793 19380 -1 2.0
127 4.500 25529 8906 12652 -1 2.0
128 5.000 22449 18729 31299 -1 2.0
129 5.500 2271 11631 5890 -1 2.0
130 6.000 19444 3930 20025 -1 2.0
131 6.500 6477 18542 11756 -1 2.0
132 7.000 4883 23126 20964 -1 2.0
133 7.500 11552 4103 15970 -1 2.0
134 8.000 11088 13492 18414 -1 2.0
135 8.500 30551 9442 12392 -1 2.0
136 9.000 23880 23836 4140 -1 2.0
137 9.500 30123 6831 14659 -1 2.0
138 10.000 18811 13865 27447 -1 2.0
139 10.500 4816 32454 23184 -1 2.0
140 11.000 15177 2169 7295 -1 2.0
141 11.500 29719 15533 895 -1 2.0
142 12.000 9374 3451 31626 -1 2.0
143 12.500 27917 21136 914 -1 2.0
144 13.000 22986 22982 13140 -1 2.0
145 13.500 10555 30271 21159 -1 2.0
146 14.000 31378 24222 13613 -1 2.0
147 14.500 4540 17455 21485 -1 2.0
148 15.000 6958 29953 20952 -1 2.0
149 15.500 2692 10112 10141 -1 2.0
150 16.000 12111 16276 16440 -1 2.0
151 16.500 11830 16190 18383 -1 2.0
152 17.000 27350 25157 8275 -1 2.0
153 17.500 1731 11965 16119 -1 2.0
154 18.000 1210 13792 26771 -1 2.0
155 18.500 29700 12691 30492 -1 2.0
156 19.000 13695 27689 10750 -1 2.0
157 19.500 28582 6713 14151 -1 2.0
158 20.000 27710 13427 9036 -1 2.0
159 20.500 8972 3465 23792 -1 2.0
160 21.000 10690 29536 79 -1 2.0
161 21.500 18244 5150 1718 -1 2.0
162 22.000 27184 12686 29979 -1 2.0
163 22.500 14291 16273 24814 -1 2.0
164 23.000 20684 28748 2161 -1 2.0
165 23.500 1670 17064 23710 -1 2.0
166 24.000 23359 13766 12725 -1 2.0
167 24.500 11176 5672 7659 -1 2.0
168 25.000 3798 31993 1096 -1 2.0
END-OF-DATA

1
event.h
View File

@ -37,6 +37,7 @@
#define COUNTSTART 10 #define COUNTSTART 10
#define COUNTEND 11 #define COUNTEND 11
#define FILELOADED 12 #define FILELOADED 12
#define MOTEND 13
#line 92 "event.w" #line 92 "event.w"

1
hmcontrol.h
View File

@ -31,6 +31,7 @@ the maximum number of slaves
int nSlaves; int nSlaves;
float fPreset; float fPreset;
CounterMode eMode; CounterMode eMode;
pICallBack pCall;
} HMcontrol, *pHMcontrol; } HMcontrol, *pHMcontrol;

8
makefile_linux
View File

@ -6,9 +6,9 @@
# Markus Zolliker, March 2003 # Markus Zolliker, March 2003
#========================================================================== #==========================================================================
# assign if the National Instrument GPIB driver is available # assign if the National Instrument GPIB driver is available
#NI= -DHAVENI NI= -DHAVENI
#NIOBJ= nigpib.o NIOBJ= nigpib.o
#NILIB=-lgpibenet NILIB=$(SINQDIR)/linux/lib/cib.o
# The variable SRC is needed for the case, where source and objects are # The variable SRC is needed for the case, where source and objects are
# separated. In the case where objects are mixed up with sources, SRC # separated. In the case where objects are mixed up with sources, SRC
@ -26,7 +26,7 @@ BINTARGET = bin
EXTRA=nintf.o EXTRA=nintf.o
SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \ SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
psi/tecs/libtecsl.a psi/tecs/libtecsl.a
LIBS = -static -L$(HDFROOT)/lib $(SUBLIBS) \ LIBS = -static -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
-ltcl8.3 $(HDFROOT)/lib/libhdf5.a \ -ltcl8.3 $(HDFROOT)/lib/libhdf5.a \
$(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \ $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
$(HDFROOT)/lib/libjpeg.a -ldl -lz -lm -ll -lc $(HDFROOT)/lib/libjpeg.a -ldl -lz -lm -ll -lc

1
nserver.h
View File

@ -32,6 +32,7 @@
mkChannel *pServerPort; mkChannel *pServerPort;
pNetRead pReader; pNetRead pReader;
int simMode; int simMode;
SConnection *dummyCon;
} SicsServer; } SicsServer;

25
nxupdate.i Normal file
View File

@ -0,0 +1,25 @@
/*-----------------------------------------------------------------------
Automatic update of NeXus files a scheduled time intervalls.
For more information see nxudpate.tex.
Internal, automatically generated file, do not modify. Modify in
nxudpate.w
copyright: see file COPYRIGHT
Mark Koennecke, December 2003
----------------------------------------------------------------------*/
typedef struct __NXUPDATE {
pObjectDescriptor pDes;
char *startScript;
char *updateScript;
char *linkScript;
int updateIntervall;
time_t nextUpdate;
int iEnd;
SConnection *pCon;
}NXupdate, *pNXupdate;

2
serialwait.h
View File

@ -12,7 +12,7 @@
#ifndef SERIALSICSWAIT #ifndef SERIALSICSWAIT
#define SERIALSICSWAIT #define SERIALSICSWAIT
#include "sics.h" #include "sics.h"
#include "hardsup/serialsinq.h" #include "psi/hardsup/serialsinq.h"
int SerialSicsExecute(void **pData, char *pCommand, char *pReply, int SerialSicsExecute(void **pData, char *pCommand, char *pReply,
int iBufLen); int iBufLen);