Ferdi Franceschini
2ec6505ef8
Merged 2.4 branch
...
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
2012-11-15 16:57:26 +11:00
Ferdi Franceschini
55347984ec
Checked files modified by the merge with:
...
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD
r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:23 +11:00
Ferdi Franceschini
6d17aca411
Counters have a mode subcommand, not countmode!
...
r1765 | ffr | 2007-04-01 10:46:51 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:36 +11:00
Ferdi Franceschini
9d9937a5b7
Control simulated hmm driver with simulated counter to mimic the real hmc.
...
r1764 | ffr | 2007-04-01 10:41:26 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:32 +11:00
Ferdi Franceschini
7526a7b93d
Modified the simulated hmm configurations so that they now source the common config and override the hmc control, the histogram::initialize and the histogram::hmmdititemval procs.
...
r1753 | ffr | 2007-03-31 11:27:52 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:56 +11:00
Ferdi Franceschini
307d7ba068
Renamed the dummy hmm control procs to match the names in the real hmm setup.
...
count_bm_controlled now does a blocking count for the simulated hmm.
r1751 | ffr | 2007-03-31 09:27:28 +1000 (Sat, 31 Mar 2007) | 3 lines
2012-11-15 13:11:49 +11:00
Ferdi Franceschini
307a3ccc6b
Declare some empty functions to make scan and nexus code happy.
...
r1628 | ffr | 2007-03-12 08:59:27 +1100 (Mon, 12 Mar 2007) | 2 lines
2012-11-15 13:05:45 +11:00
Ferdi Franceschini
afd6ed2fdf
Create simulated counter.
...
r1579 | ffr | 2007-03-03 09:22:23 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:19 +11:00
Ferdi Franceschini
315240ea52
New config file from Mark Lesha.
...
r1578 | ffr | 2007-03-03 09:20:40 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:16 +11:00
Ferdi Franceschini
1bfd9eb459
Added dummy proc for bm controlled hs count
...
r1557 | ffr | 2007-02-26 13:25:04 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:15 +11:00
Ferdi Franceschini
8d2488b9de
Use generic name for scan header.
...
r1532 | ffr | 2007-02-20 16:15:49 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:01:06 +11:00
Ferdi Franceschini
c311ce8b49
Use new dir structure.
...
r1522 | ffr | 2007-02-20 08:18:29 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:39 +11:00
Ferdi Franceschini
79a22edc20
Deployment manifest for script validator.
...
r1518 | ffr | 2007-02-20 08:09:50 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:27 +11:00
Ferdi Franceschini
bc7fd549a0
The script validator needs its own port numbers because it runs on the same machine as the instrument control serverl.
...
r1517 | ffr | 2007-02-20 08:09:20 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:25 +11:00
Ferdi Franceschini
e8ced124e0
Simulated hmm for script validator
...
r1516 | ffr | 2007-02-20 08:08:23 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:22 +11:00
Ferdi Franceschini
cb4a98491f
Simulated histogram memory
...
r1483 | ffr | 2007-02-14 16:51:38 +1100 (Wed, 14 Feb 2007) | 2 lines
2012-11-15 12:58:47 +11:00