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

- new focusmerge.dat for new merge type

Browse Source
This commit is contained in:
cvs
2001-04-27 08:37:42 +00:00
parent 8c2285026b
commit 63d84a85ad
11 changed files with 442 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -60,7 +60,7 @@ VELOOBJ = velo.o velosim.o velodorn.o velodornier.o
#----- comment or uncomment the following according to operating system #----- comment or uncomment the following according to operating system
#------------- for Digital Unix #------------- for Digital Unix
BINTARGET=. BINTARGET=bin
HDFROOT=/data/koenneck HDFROOT=/data/koenneck
CC=cc CC=cc
EXTRA= EXTRA=
@ -97,9 +97,10 @@ all: $(BINTARGET)/SICServer
$(BINTARGET)/SICServer: $(SOBJ) $(MOTOROBJ) \ $(BINTARGET)/SICServer: $(SOBJ) $(MOTOROBJ) \
$(COUNTEROBJ) $(DMCOBJ) $(VELOOBJ) $(DIFIL) \ $(COUNTEROBJ) $(DMCOBJ) $(VELOOBJ) $(DIFIL) \
$(EXTRA) $(EXTRA)
$(CC) -g -o $(BINTARGET)/SICServer \ $(CC) -g -o SICServer \
$(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) \ $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) \
$(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS) $(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS)
cp SICServer $(BINTARGET)
clean: clean:
- rm -f *.o - rm -f *.o

2
danu.dat
View File

@ -1,3 +1,3 @@
7671 7674
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

2
doc/user/samenv.htm
View File

@ -209,7 +209,7 @@ current value.
can be achieved by using the drive command. can be achieved by using the drive command.
and <b>log frequency</b> (both below) and <b>log frequency</b> (both below)
</DL> </DL>
<h3>Logging </h2> <h3>Logging </h3>
The values of any sample environement device can be logged. There are two The values of any sample environement device can be logged. There are two
features: features:
<ul> <ul>

9
doc/user/tricsman
View File

@ -18,7 +18,7 @@
\begin{huge} \begin{huge}
TRICS--Reference Manual \\ TRICS--Reference Manual \\
\end{huge} \end{huge}
Version February, 2000\\ Version April, 2000\\
Dr. Mark K\"onnecke \\ Dr. Mark K\"onnecke \\
Labor f\"ur Neutronenstreuung\\ Labor f\"ur Neutronenstreuung\\
Paul Scherrer Institut\\ Paul Scherrer Institut\\
@ -340,7 +340,14 @@ H H L
\end{verbatim} \end{verbatim}
%html mesure.htm 2 %html mesure.htm 2
%html hklscan.htm 2 %html hklscan.htm 2
%html tricspsd.htm 1 %html tricspsd.htm 1
%html histogram.htm 2 %html histogram.htm 2
%html nextrics.htm 2 %html nextrics.htm 2
%html trscan.htm 2
%html psddata.htm 1
%html xds.htm 2
%html auto.htm 2
%html autocloud.htm 3
\end{document} \end{document}

7
doc/user/tricspsd.htm
View File

@ -5,13 +5,14 @@
<BODY> <BODY>
<H1>TRICS with Position Sensitive Detectors</H1> <H1>TRICS with Position Sensitive Detectors</H1>
<P> <P>
As there are no PSD's available for TRICS, not much can be found here. There are no PSD's available yet, but the software is already ready. TRICS
In terms of software the following pieces are already available: with a PSD requires the following special features.
<ul> <ul>
<li>Instructions for dealing wih <a href="histogram.htm"> <li>Instructions for dealing wih <a href="histogram.htm">
histogram memory</a>. histogram memory</a>.
<li><a href="nextrics.htm">NeXus</a> data handling for TRICS. <li><a href="nextrics.htm">NeXus</a> data handling for TRICS.
<li>A TRICS specific <a href="trscan.htm">count and scan</a> command.
</ul> </ul>
</P> </p>
</BODY> </BODY>
</HTML> </HTML>

636
focusmerge.dat
View File

@ -1,5 +1,5 @@
#---- Merge Table #---- Merge Table
273 383
001 10.050 000 001 000 001 10.050 000 001 000
002 10.850 000 002 000 002 10.850 000 002 000
003 11.660 000 003 000 003 11.660 000 003 000
@ -11,268 +11,378 @@
009 16.470 000 009 000 009 16.470 000 009 000
010 17.270 000 010 000 010 17.270 000 010 000
011 18.070 000 011 000 011 18.070 000 011 000
012 18.350 001 000 001 012 18.350 001 000 000
013 18.880 000 012 000 013 18.350 000 000 001
014 19.175 002 000 002 014 18.880 000 012 000
015 19.680 000 013 000 015 19.175 002 000 000
016 20.000 003 000 003 016 19.175 000 000 002
017 20.480 000 014 000 017 19.680 000 013 000
018 20.825 004 000 004 018 20.000 003 000 000
019 21.280 000 015 000 019 20.000 000 000 003
020 21.650 005 000 005 020 20.480 000 014 000
021 22.090 000 016 000 021 20.825 004 000 000
022 22.890 000 017 000 022 20.825 000 000 004
023 23.350 006 000 006 023 21.280 000 015 000
024 23.690 000 018 000 024 21.650 005 000 000
025 24.175 007 000 007 025 21.650 000 000 005
026 24.490 000 019 000 026 22.090 000 016 000
027 25.000 008 000 008 027 22.890 000 017 000
028 25.290 000 020 000 028 23.350 006 000 000
029 25.825 009 000 009 029 23.350 000 000 006
030 26.100 000 021 000 030 23.690 000 018 000
031 26.650 010 000 010 031 24.175 007 000 000
032 26.900 000 022 000 032 24.175 000 000 007
033 27.700 000 023 000 033 24.490 000 019 000
034 28.350 011 000 011 034 25.000 008 000 000
035 28.500 000 024 000 035 25.000 000 000 008
036 29.175 012 000 012 036 25.290 000 020 000
037 29.310 000 025 000 037 25.825 009 000 000
038 30.000 013 000 013 038 25.825 000 000 009
039 30.110 000 026 000 039 26.100 000 021 000
040 30.825 014 000 014 040 26.650 010 000 000
041 30.910 000 027 000 041 26.650 000 000 010
042 31.650 015 000 015 042 26.900 000 022 000
043 31.710 000 028 000 043 27.700 000 023 000
044 32.510 000 029 000 044 28.350 011 000 000
045 33.320 000 030 000 045 28.350 000 000 011
046 33.350 016 000 016 046 28.500 000 024 000
047 34.120 000 031 000 047 29.175 012 000 000
048 34.175 017 000 017 048 29.175 000 000 012
049 34.920 000 032 000 049 29.310 000 025 000
050 35.000 018 000 018 050 30.000 013 000 000
051 35.720 000 033 000 051 30.000 000 000 013
052 35.825 019 000 019 052 30.110 000 026 000
053 36.520 000 034 000 053 30.825 014 000 000
054 36.650 020 000 020 054 30.825 000 000 014
055 37.330 000 035 000 055 30.910 000 027 000
056 38.130 000 036 000 056 31.650 015 000 000
057 38.350 021 000 021 057 31.650 000 000 015
058 38.930 000 037 000 058 31.710 000 028 000
059 39.175 022 000 022 059 32.510 000 029 000
060 39.730 000 038 000 060 33.320 000 030 000
061 40.000 023 000 023 061 33.350 016 000 000
062 40.540 000 039 000 062 33.350 000 000 016
063 40.825 024 000 024 063 34.120 000 031 000
064 41.340 000 040 000 064 34.175 017 000 000
065 41.650 025 000 025 065 34.175 000 000 017
066 42.140 000 041 000 066 34.920 000 032 000
067 42.850 026 000 026 067 35.000 018 000 000
068 42.940 000 042 000 068 35.000 000 000 018
069 43.675 027 000 027 069 35.720 000 033 000
070 43.740 000 043 000 070 35.825 019 000 000
071 44.500 028 000 028 071 35.825 000 000 019
072 44.550 000 044 000 072 36.520 000 034 000
073 45.325 029 000 029 073 36.650 020 000 000
074 45.350 000 045 000 074 36.650 000 000 020
075 46.150 030 046 030 075 37.330 000 035 000
076 46.950 000 047 000 076 38.130 000 036 000
077 47.350 031 000 031 077 38.350 021 000 000
078 47.760 000 048 000 078 38.350 000 000 021
079 48.175 032 000 032 079 38.930 000 037 000
080 48.560 000 049 000 080 39.175 022 000 000
081 49.000 033 000 033 081 39.175 000 000 022
082 49.360 000 050 000 082 39.730 000 038 000
083 49.825 034 000 034 083 40.000 023 000 000
084 50.160 000 051 000 084 40.000 000 000 023
085 50.650 035 000 035 085 40.540 000 039 000
086 50.960 000 052 000 086 40.825 024 000 000
087 51.770 000 053 000 087 40.825 000 000 024
088 51.850 036 000 036 088 41.340 000 040 000
089 52.570 000 054 000 089 41.650 025 000 000
090 52.675 037 000 037 090 41.650 000 000 025
091 53.370 000 055 000 091 42.140 000 041 000
092 53.500 038 000 038 092 42.850 026 000 000
093 54.170 000 056 000 093 42.850 000 000 026
094 54.325 039 000 039 094 42.940 000 042 000
095 54.980 000 057 000 095 43.675 027 000 000
096 55.150 040 000 040 096 43.675 000 000 027
097 55.780 000 058 000 097 43.740 000 043 000
098 56.350 041 000 041 098 44.500 028 000 000
099 56.580 000 059 000 099 44.500 000 000 028
100 57.175 042 000 042 100 44.550 000 044 000
101 57.380 000 060 000 101 45.325 029 000 000
102 58.000 043 000 043 102 45.325 000 000 029
103 58.180 000 061 000 103 45.350 000 045 000
104 58.825 044 000 044 104 46.150 000 046 000
105 58.990 000 062 000 105 46.150 030 000 000
106 59.650 045 000 045 106 46.150 000 000 030
107 59.790 000 063 000 107 46.950 000 047 000
108 60.590 000 064 000 108 47.350 031 000 000
109 60.850 046 000 046 109 47.350 000 000 031
110 61.390 000 065 000 110 47.760 000 048 000
111 61.675 047 000 047 111 48.175 032 000 000
112 62.190 000 066 000 112 48.175 000 000 032
113 62.500 048 000 048 113 48.560 000 049 000
114 63.000 000 067 000 114 49.000 033 000 000
115 63.325 049 000 049 115 49.000 000 000 033
116 63.800 000 068 000 116 49.360 000 050 000
117 64.150 050 000 050 117 49.825 034 000 000
118 64.600 000 069 000 118 49.825 000 000 034
119 65.350 051 000 000 119 50.160 000 051 000
120 65.400 000 070 000 120 50.650 035 000 000
121 66.175 052 000 000 121 50.650 000 000 035
122 66.210 000 071 000 122 50.960 000 052 000
123 67.000 053 000 000 123 51.770 000 053 000
124 67.010 000 072 000 124 51.850 036 000 000
125 67.810 000 073 000 125 51.850 000 000 036
126 67.825 054 000 000 126 52.570 000 054 000
127 68.610 000 074 000 127 52.675 037 000 000
128 68.650 055 000 051 128 52.675 000 000 037
129 69.410 000 075 000 129 53.370 000 055 000
130 69.850 056 000 000 130 53.500 038 000 000
131 70.350 000 000 052 131 53.500 000 000 038
132 70.675 057 000 000 132 54.170 000 056 000
133 71.175 000 000 053 133 54.325 039 000 000
134 71.500 058 000 000 134 54.325 000 000 039
135 72.000 000 000 054 135 54.980 000 057 000
136 72.325 059 000 000 136 55.150 040 000 000
137 72.825 000 000 055 137 55.150 000 000 040
138 72.900 000 076 000 138 55.780 000 058 000
139 73.650 000 000 056 139 56.350 041 000 000
140 73.700 000 077 000 140 56.350 000 000 041
141 74.510 000 078 000 141 56.580 000 059 000
142 74.850 000 000 057 142 57.175 042 000 000
143 75.310 000 079 000 143 57.175 000 000 042
144 75.675 000 000 058 144 57.380 000 060 000
145 76.110 000 080 000 145 58.000 043 000 000
146 76.500 060 000 059 146 58.000 000 000 043
147 76.910 000 081 000 147 58.180 000 061 000
148 77.325 061 000 060 148 58.825 044 000 000
149 77.710 000 082 000 149 58.825 000 000 044
150 78.150 062 000 061 150 58.990 000 062 000
151 78.520 000 083 000 151 59.650 045 000 000
152 79.320 000 084 000 152 59.650 000 000 045
153 79.350 063 000 062 153 59.790 000 063 000
154 80.120 000 085 000 154 60.590 000 064 000
155 80.175 064 000 063 155 60.850 046 000 000
156 80.920 000 086 000 156 60.850 000 000 046
157 81.000 065 000 064 157 61.390 000 065 000
158 81.720 000 087 000 158 61.675 047 000 000
159 81.825 066 000 065 159 61.675 000 000 047
160 82.530 000 088 000 160 62.190 000 066 000
161 82.650 067 000 066 161 62.500 048 000 000
162 83.330 000 089 000 162 62.500 000 000 048
163 83.850 068 000 067 163 63.000 000 067 000
164 84.130 000 090 000 164 63.325 049 000 000
165 84.675 069 000 068 165 63.325 000 000 049
166 84.930 000 091 000 166 63.800 000 068 000
167 85.500 070 000 069 167 64.150 050 000 000
168 85.740 000 092 000 168 64.150 000 000 050
169 86.325 071 000 070 169 64.600 000 069 000
170 86.540 000 093 000 170 65.350 051 000 000
171 87.150 072 000 071 171 65.400 000 070 000
172 87.340 000 094 000 172 66.175 052 000 000
173 88.140 000 095 000 173 66.210 000 071 000
174 88.350 073 000 072 174 67.000 053 000 000
175 88.940 000 096 000 175 67.010 000 072 000
176 89.175 074 000 073 176 67.810 000 073 000
177 89.750 000 097 000 177 67.825 054 000 000
178 90.000 075 000 074 178 68.610 000 074 000
179 90.550 000 098 000 179 68.650 055 000 000
180 90.825 076 000 075 180 68.650 000 000 051
181 91.350 000 099 000 181 69.410 000 075 000
182 91.650 077 000 076 182 69.850 056 000 000
183 92.150 000 100 000 183 70.350 000 000 052
184 92.850 078 000 077 184 70.675 057 000 000
185 92.960 000 101 000 185 71.175 000 000 053
186 93.675 079 000 078 186 71.500 058 000 000
187 93.760 000 102 000 187 72.000 000 000 054
188 94.500 080 000 079 188 72.325 059 000 000
189 94.560 000 103 000 189 72.825 000 000 055
190 95.325 081 000 080 190 72.900 000 076 000
191 95.360 000 104 000 191 73.650 000 000 056
192 96.150 082 000 081 192 73.700 000 077 000
193 96.160 000 105 000 193 74.510 000 078 000
194 96.970 000 106 000 194 74.850 000 000 057
195 97.350 083 000 082 195 75.310 000 079 000
196 97.770 000 107 000 196 75.675 000 000 058
197 98.175 084 000 083 197 76.110 000 080 000
198 98.570 000 108 000 198 76.500 060 000 000
199 99.000 085 000 084 199 76.500 000 000 059
200 99.370 000 109 000 200 76.910 000 081 000
201 99.825 086 000 085 201 77.325 061 000 000
202 100.180 000 110 000 202 77.325 000 000 060
203 100.650 087 000 086 203 77.710 000 082 000
204 100.980 000 111 000 204 78.150 062 000 000
205 101.780 000 112 000 205 78.150 000 000 061
206 101.850 088 000 087 206 78.520 000 083 000
207 102.580 000 113 000 207 79.320 000 084 000
208 102.675 089 000 088 208 79.350 063 000 000
209 103.380 000 114 000 209 79.350 000 000 062
210 103.500 090 000 089 210 80.120 000 085 000
211 104.190 000 115 000 211 80.175 064 000 000
212 104.325 091 000 090 212 80.175 000 000 063
213 104.990 000 116 000 213 80.920 000 086 000
214 105.150 092 000 091 214 81.000 065 000 000
215 105.790 000 117 000 215 81.000 000 000 064
216 106.350 093 000 092 216 81.720 000 087 000
217 106.590 000 118 000 217 81.825 066 000 000
218 107.175 094 000 093 218 81.825 000 000 065
219 107.390 000 119 000 219 82.530 000 088 000
220 108.000 095 000 094 220 82.650 067 000 000
221 108.200 000 120 000 221 82.650 000 000 066
222 108.825 096 000 095 222 83.330 000 089 000
223 109.000 000 121 000 223 83.850 068 000 000
224 109.650 097 000 096 224 83.850 000 000 067
225 109.800 000 122 000 225 84.130 000 090 000
226 110.600 000 123 000 226 84.675 069 000 000
227 110.850 098 000 097 227 84.675 000 000 068
228 111.410 000 124 000 228 84.930 000 091 000
229 111.675 099 000 098 229 85.500 070 000 000
230 112.210 000 125 000 230 85.500 000 000 069
231 112.500 100 000 099 231 85.740 000 092 000
232 113.010 000 126 000 232 86.325 071 000 000
233 113.325 101 000 100 233 86.325 000 000 070
234 113.810 000 127 000 234 86.540 000 093 000
235 114.150 102 000 101 235 87.150 072 000 000
236 114.610 000 128 000 236 87.150 000 000 071
237 115.350 103 000 102 237 87.340 000 094 000
238 115.420 000 129 000 238 88.140 000 095 000
239 116.175 104 000 103 239 88.350 073 000 000
240 116.220 000 130 000 240 88.350 000 000 072
241 117.000 105 000 104 241 88.940 000 096 000
242 117.020 000 131 000 242 89.175 074 000 000
243 117.820 000 132 000 243 89.175 000 000 073
244 117.825 106 000 105 244 89.750 000 097 000
245 118.630 000 133 000 245 90.000 075 000 000
246 118.650 107 000 106 246 90.000 000 000 074
247 119.430 000 134 000 247 90.550 000 098 000
248 119.850 108 000 107 248 90.825 076 000 000
249 120.230 000 135 000 249 90.825 000 000 075
250 120.675 109 000 108 250 91.350 000 099 000
251 121.030 000 136 000 251 91.650 077 000 000
252 121.500 110 000 109 252 91.650 000 000 076
253 121.830 000 137 000 253 92.150 000 100 000
254 122.325 111 000 110 254 92.850 078 000 000
255 122.640 000 138 000 255 92.850 000 000 077
256 123.150 112 000 111 256 92.960 000 101 000
257 123.440 000 139 000 257 93.675 079 000 000
258 124.240 000 140 000 258 93.675 000 000 078
259 124.350 113 000 112 259 93.760 000 102 000
260 125.040 000 141 000 260 94.500 080 000 000
261 125.175 114 000 113 261 94.500 000 000 079
262 125.850 000 142 000 262 94.560 000 103 000
263 126.000 115 000 114 263 95.325 081 000 000
264 126.650 000 143 000 264 95.325 000 000 080
265 126.825 116 000 115 265 95.360 000 104 000
266 127.450 000 144 000 266 96.150 082 000 000
267 127.650 117 000 116 267 96.150 000 000 081
268 128.250 000 145 000 268 96.160 000 105 000
269 129.050 000 146 000 269 96.970 000 106 000
270 129.860 000 147 000 270 97.350 083 000 000
271 130.660 000 148 000 271 97.350 000 000 082
272 131.460 000 149 000 272 97.770 000 107 000
273 132.260 000 150 000 273 98.175 084 000 000
274 98.175 000 000 083
275 98.570 000 108 000
276 99.000 085 000 000
277 99.000 000 000 084
278 99.370 000 109 000
279 99.825 086 000 000
280 99.825 000 000 085
281 100.180 000 110 000
282 100.650 087 000 000
283 100.650 000 000 086
284 100.980 000 111 000
285 101.780 000 112 000
286 101.850 088 000 000
287 101.850 000 000 087
288 102.580 000 113 000
289 102.675 089 000 000
290 102.675 000 000 088
291 103.380 000 114 000
292 103.500 090 000 000
293 103.500 000 000 089
294 104.190 000 115 000
295 104.325 091 000 000
296 104.325 000 000 090
297 104.990 000 116 000
298 105.150 092 000 000
299 105.150 000 000 091
300 105.790 000 117 000
301 106.350 093 000 000
302 106.350 000 000 092
303 106.590 000 118 000
304 107.175 094 000 000
305 107.175 000 000 093
306 107.390 000 119 000
307 108.000 095 000 000
308 108.000 000 000 094
309 108.200 000 120 000
310 108.825 096 000 000
311 108.825 000 000 095
312 109.000 000 121 000
313 109.650 097 000 000
314 109.650 000 000 096
315 109.800 000 122 000
316 110.600 000 123 000
317 110.850 098 000 000
318 110.850 000 000 097
319 111.410 000 124 000
320 111.675 099 000 000
321 111.675 000 000 098
322 112.210 000 125 000
323 112.500 100 000 000
324 112.500 000 000 099
325 113.010 000 126 000
326 113.325 101 000 000
327 113.325 000 000 100
328 113.810 000 127 000
329 114.150 102 000 000
330 114.150 000 000 101
331 114.610 000 128 000
332 115.350 103 000 000
333 115.350 000 000 102
334 115.420 000 129 000
335 116.175 104 000 000
336 116.175 000 000 103
337 116.220 000 130 000
338 117.000 105 000 000
339 117.000 000 000 104
340 117.020 000 131 000
341 117.820 000 132 000
342 117.825 106 000 000
343 117.825 000 000 105
344 118.630 000 133 000
345 118.650 107 000 000
346 118.650 000 000 106
347 119.430 000 134 000
348 119.850 108 000 000
349 119.850 000 000 107
350 120.230 000 135 000
351 120.675 109 000 000
352 120.675 000 000 108
353 121.030 000 136 000
354 121.500 110 000 000
355 121.500 000 000 109
356 121.830 000 137 000
357 122.325 111 000 000
358 122.325 000 000 110
359 122.640 000 138 000
360 123.150 112 000 000
361 123.150 000 000 111
362 123.440 000 139 000
363 124.240 000 140 000
364 124.350 113 000 000
365 124.350 000 000 112
366 125.040 000 141 000
367 125.175 114 000 000
368 125.175 000 000 113
369 125.850 000 142 000
370 126.000 115 000 000
371 126.000 000 000 114
372 126.650 000 143 000
373 126.825 116 000 000
374 126.825 000 000 115
375 127.450 000 144 000
376 127.650 117 000 000
377 127.650 000 000 116
378 128.250 000 145 000
379 129.050 000 146 000
380 129.860 000 147 000
381 130.660 000 148 000
382 131.460 000 149 000
383 132.260 000 150 000
#----- upper bank two theta #----- upper bank two theta
117 117
18.35 18.35

7
fomerge.c
View File

@ -36,7 +36,7 @@ typedef int HistInt;
int medium, upper, lower; int medium, upper, lower;
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
The tables with the theta values for the detector banks aand the merge The tables with the theta values for the detector banks and the merge
table living in mergeUp, mergeMed, mergeLow is initialized from a table living in mergeUp, mergeMed, mergeLow is initialized from a
data file, the mergefile. mergeUp, mergeLow, mergeMed contain a 0 if data file, the mergefile. mergeUp, mergeLow, mergeMed contain a 0 if
the detector from this bank does not need to be summed for this merged the detector from this bank does not need to be summed for this merged
@ -225,9 +225,12 @@ int setFMDataPointer(HistInt *lData, int mytimeBins)
fprintf(stdout,"ERROR: out of memory in fomerge.setFMdataPointer\n"); fprintf(stdout,"ERROR: out of memory in fomerge.setFMdataPointer\n");
return 0; return 0;
} }
memset(mergedData,0,nMerged*timeBin*sizeof(HistInt));
} }
/*
clear mergedData to 0
*/
memset(mergedData,0,nMerged*timeBin*sizeof(HistInt));
iMerged = 0; iMerged = 0;
return 1; return 1;
} }

17
fowrite.c
View File

@ -657,6 +657,15 @@
return; return;
} }
if( (self->iUpper || self->iLower) && self->iMiddle)
{
NXDupdate(pDict,"bank","merged");
NXDaliaslink(pFile,pDict,"dana","dcounts");
NXDaliaslink(pFile,pDict,"dana","dtime");
NXDaliaslink(pFile,pDict,"dana","dtheta");
NXDaliaslink(pFile,pDict,"dana","cnmon1");
}
if(self->iUpper) if(self->iUpper)
{ {
NXDupdate(pDict,"bank","upperbank"); NXDupdate(pDict,"bank","upperbank");
@ -681,14 +690,6 @@
NXDaliaslink(pFile,pDict,"dana","dtheta"); NXDaliaslink(pFile,pDict,"dana","dtheta");
NXDaliaslink(pFile,pDict,"dana","cnmon1"); NXDaliaslink(pFile,pDict,"dana","cnmon1");
} }
if( (self->iUpper || self->iLower) && self->iMiddle)
{
NXDupdate(pDict,"bank","merged");
NXDaliaslink(pFile,pDict,"dana","dcounts");
NXDaliaslink(pFile,pDict,"dana","dtime");
NXDaliaslink(pFile,pDict,"dana","dtheta");
NXDaliaslink(pFile,pDict,"dana","cnmon1");
}
/* close everything */ /* close everything */

2
test.tcl
View File

@ -641,6 +641,8 @@ delay 2500
MakeFocusAverager average hm MakeFocusAverager average hm
FocusInstall hm focus.dic $shome/sics/focusmerge.dat FocusInstall hm focus.dic $shome/sics/focusmerge.dat
storefocus upper 1
storefocus lower 1
#MakeChopper choco docho lnsp20 4000 8 #MakeChopper choco docho lnsp20 4000 8
MakeChopper choco sim MakeChopper choco sim

70
utils/Makefile
View File

@ -7,63 +7,63 @@
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
#------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version) #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
##CC = cc CC = cc
##CFLAGS = -std -g -warnprotos -I. -I../hardsup CFLAGS = -std -g -warnprotos -I. -I../hardsup
##BIN = osf.axp BIN = ../bin
##LFLAGS = -L../hardsup LFLAGS = -L../hardsup
#------------ for Linux #------------ for Linux
CC = gcc #CC = gcc
CFLAGS = -g -I. -I../hardsup -DLinux #CFLAGS = -g -I. -I../hardsup -DLinux
BIN = linux.i686 #BIN = linux.i686
LFLAGS = -L../hardsup -L/usr/X11R6/lib #LFLAGS = -L../hardsup -L/usr/X11R6/lib
#------------ #------------
#---------------------------------------------------------- #----------------------------------------------------------
all: $(HOME)/bin/$(BIN)/asynsrv_test \ all: $(BIN)/asynsrv_test \
$(HOME)/bin/$(BIN)/el734 \ $(BIN)/el734 \
$(HOME)/bin/$(BIN)/el734_test \ $(BIN)/el734_test \
$(HOME)/bin/$(BIN)/el737 \ $(BIN)/el737 \
$(HOME)/bin/$(BIN)/SerPortServer $(BIN)/SerPortServer
#---------------------------------------------------------- #----------------------------------------------------------
$(HOME)/bin/$(BIN)/SerPortServer: SerPortServer.c $(BIN)/SerPortServer: SerPortServer.c
rm -f $(HOME)/bin/$(BIN)/SerPortServer rm -f $(BIN)/SerPortServer
$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/SerPortServer \ $(CC) $(CFLAGS) -o $(BIN)/SerPortServer \
SerPortServer.c $(LFLAGS) -lhlib -lX11 SerPortServer.c $(LFLAGS) -lhlib -lX11
$(HOME)/bin/$(BIN)/asynsrv_test: asynsrv_test.c $(BIN)/asynsrv_test: asynsrv_test.c
rm -f $(HOME)/bin/$(BIN)/asynsrv_test rm -f $(BIN)/asynsrv_test
$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/asynsrv_test \ $(CC) $(CFLAGS) -o $(BIN)/asynsrv_test \
asynsrv_test.c $(LFLAGS) -lhlib -lX11 asynsrv_test.c $(LFLAGS) -lhlib -lX11
$(HOME)/bin/$(BIN)/el734: el734.c $(BIN)/el734: el734.c
@ echo "el734 needs Motif library. Not yet found on linux" @ echo "el734 needs Motif library. Not yet found on linux"
## rm -f $(HOME)/bin/$(BIN)/el734 rm -f $(BIN)/el734
## $(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/el734 \ $(CC) $(CFLAGS) -o $(BIN)/el734 \
## el734.c $(LFLAGS) -lhlib -lX11 el734.c $(LFLAGS) -lhlib -lX11 -lXm
$(HOME)/bin/$(BIN)/el734_test: el734_test.c $(BIN)/el734_test: el734_test.c
rm -f $(HOME)/bin/$(BIN)/el734_test rm -f $(BIN)/el734_test
$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/el734_test \ $(CC) $(CFLAGS) -o $(BIN)/el734_test \
el734_test.c $(LFLAGS) -lhlib -lX11 el734_test.c $(LFLAGS) -lhlib -lX11
$(HOME)/bin/$(BIN)/el737: el737.c $(BIN)/el737: el737.c
@ echo "el737 needs Motif library. Not yet found on linux" @ echo "el737 needs Motif library. Not yet found on linux"
## rm -f $(HOME)/bin/$(BIN)/el737 rm -f $(BIN)/el737
## $(CC) $(CFLAGS) -I/usr/X11R6/include -o $(HOME)/bin/$(BIN)/el737 \ $(CC) $(CFLAGS) -I/usr/X11R6/include -o $(BIN)/el737 \
## el737.c $(LFLAGS) -lhlib -lXm -lXt -lX11 el737.c $(LFLAGS) -lhlib -lXm -lXt -lX11 -lm
#---------------------------------------------------------- #----------------------------------------------------------
clean: clean:
- rm -f *.o - rm -f *.o
- rm -f $(HOME)/bin/$(BIN)/SerPortServer \ - rm -f $(BIN)/SerPortServer \
$(HOME)/bin/$(BIN)/asynsrv_test \ $(BIN)/asynsrv_test \
$(HOME)/bin/$(BIN)/el734 \ $(BIN)/el734 \
$(HOME)/bin/$(BIN)/el734_test \ $(BIN)/el734_test \
$(HOME)/bin/$(BIN)/el737 $(BIN)/el737
#---------------------------------------------------------- #----------------------------------------------------------
.c.o: .c.o:
$(CC) $(CFLAGS) -c $*.c $(CC) $(CFLAGS) -c $*.c

2
utils/el734_test.c
View File

@ -388,7 +388,7 @@
#include <time.h> #include <time.h>
struct timespec delay = {0, 250000000}; struct timespec delay = {0, 250000000};
struct timespec delay_left; struct timespec delay_left;
#define hibernate nanosleep (&delay, &delay_left) #define hibernate nanosleep_d9 (&delay, &delay_left)
#endif #endif
int i, msr, ss, s_stat; int i, msr, ss, s_stat;
int my_verbose; int my_verbose;