From 1b6d046394dfc2d0f8f93f0bad6db6f87056a733 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 25 Nov 2011 15:05:19 +1100 Subject: [PATCH] Revert the SICS scan object to allow multidimensional scans. r3289 | ffr | 2011-11-25 15:05:19 +1100 (Fri, 25 Nov 2011) | 2 lines --- scan.c | 3 +-- site_ansto/instrument/tas/config/counter/counter.tcl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scan.c b/scan.c index 208cc8fc..a5399656 100644 --- a/scan.c +++ b/scan.c @@ -2023,8 +2023,7 @@ static int DumpScan(pScanData self, SConnection *pCon) SCWrite(pCon,pBueffel,eError); return 0; } - iRet = ClearScanVar(self); - iRet = iRet && AddScanVar(self,pSics,pCon,argv[2], + iRet = AddScanVar(self,pSics,pCon,argv[2], (float)fStart,(float)fStep); if(iRet) { diff --git a/site_ansto/instrument/tas/config/counter/counter.tcl b/site_ansto/instrument/tas/config/counter/counter.tcl index 3ae86d84..22419975 100644 --- a/site_ansto/instrument/tas/config/counter/counter.tcl +++ b/site_ansto/instrument/tas/config/counter/counter.tcl @@ -15,7 +15,7 @@ proc ::counter::isc_initialize {} { variable isc_numchannels variable isc_monitor_address variable isc_portlist - variable isc_beam_monitor_list {MONITOR_1 MONITOR_2 MONITOR_3} + variable isc_beam_monitor_list {MONITOR_1 MONITOR_2} set isc_monitor_address "das1-[SplitReply [instrument]]" set isc_portlist [list 30000 30001 30002 30003 30004 30005 30006 30007]