From 88489adc494f02803c57858a07f5478ffed068cb Mon Sep 17 00:00:00 2001
From: Dan Bartlett <dbx@ansto.gov.au>
Date: Thu, 23 Aug 2007 15:48:22 +1000
Subject: [PATCH] fast shutter code added

r2140 | dbx | 2007-08-23 15:48:22 +1000 (Thu, 23 Aug 2007) | 2 lines
---
 .../instrument/sans/DMC2280/controller1.txt   | 35 +++++++++++++------
 .../instrument/sans/DMC2280/controller4.txt   |  8 ++---
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/site_ansto/instrument/sans/DMC2280/controller1.txt b/site_ansto/instrument/sans/DMC2280/controller1.txt
index 8f18c2c9..fd45618f 100644
--- a/site_ansto/instrument/sans/DMC2280/controller1.txt
+++ b/site_ansto/instrument/sans/DMC2280/controller1.txt
@@ -1,14 +1,14 @@
 NO TE: QUOKKA - CONTROLLER 1
 NO TE:
-NO TE: $Revision: 1.6 $
-NO TE: $Date: 2007-08-16 04:31:07 $
+NO TE: $Revision: 1.7 $
+NO TE: $Date: 2007-08-23 05:47:30 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
 NO TE: A-SAMPLE UPPER TILT
 NO TE: B-SAMPLE LOWER TILT
-NO TE: C-SAMPLE TRANSLATION Y (ACROSS BEAM)
-NO TE: D-SAMPLE TRANSLATION X (ALONG BEAM)
+NO TE: C-SAMPLE TRANSLATION Y (ALONG BEAM)
+NO TE: D-SAMPLE TRANSLATION X (ACROSS BEAM)
 NO TE: E-SAMPLE RAISE
 NO TE: F-SAMPLE ROTATE
 NO TE: G-DETECTOR Y (ALONG BEAM)
@@ -70,14 +70,29 @@ ELSE
 SB 13;' MOTOR OFF = BRAKE DENERGISED = LOCKED
 ENDIF
 NO TE: CONTROLS THE FAST SHUTTER
-NO TE: FAST SHUTTER MUST BE UP WHEN DETECTOR Z AXIS ACTIVE
-NO TE: INPUT 13 = FAST SHUTTER CLOSED
-NO TE: INPUT 14 = FAST SHUTTER OPEN
-NO TE: INPUT 15 = ONE OR MORE BEAM STOPS RAISED (FROM CONTROLLER 4)
-IF (_MOG=1) & (_TI1&64)
-NO TE: DETECTOR Z INACTIVE AND ONE OR MORE BEAM STOPS UP
+NO TE:
+NO TE: FAST SHUTTER MUST BE CLOSED WHEN DETECTOR Z AXIS ACTIVE
+NO TE: INPUT 13 = FAST SHUTTER OPEN
+NO TE: INPUT 14 = FAST SHUTTER CLOSED
+NO TE: INPUT 5 = ONE OR MORE BEAM STOPS RAISED (FROM CONTROLLER 4)
+IF (_MOG=1) & (@IN[5]=0)
+NO TE: DETECTOR Y INACTIVE AND ONE OR MORE BEAM STOPS UP
 CB 15;' ENERGISE FAST SHUTTER SOLENOID = SHUTTER OPEN
 ENDIF
+IF (_MOG=0)&(@IN[14])
+NO TE:  DETECTOR Y AXIS IS ACTIVE AND FAST SHUTTER NOT CLOSED
+SB15;' CLOSE FAST SHUTTER
+IF (_BGG=1)
+STG;' DETECTOR Y MOVING, COMMANDED TO STOP
+AMG;'WAIT UNTIL STOPPED
+ENDIF
+MOG;' TURN DETECTOR Y OFF UNTIL FAST SHUTTER IS CLOSED
+AI13;' WAIT FOR SHUTTER TO CLOSE
+IF (@IN[14]=0)
+NO TE: FAST SHUTTER IS CLOSED
+SHG
+ENDIF
+ENDIF
 JP #THREAD0
 EN
 NO ----------------------------------------
diff --git a/site_ansto/instrument/sans/DMC2280/controller4.txt b/site_ansto/instrument/sans/DMC2280/controller4.txt
index 73dbc9c4..02937740 100644
--- a/site_ansto/instrument/sans/DMC2280/controller4.txt
+++ b/site_ansto/instrument/sans/DMC2280/controller4.txt
@@ -1,7 +1,7 @@
 NO TE: QUOKKA - CONTROLLER 4
 NO TE:
-NO TE: $Revision: 1.5 $
-NO TE: $Date: 2007-08-16 04:31:07 $
+NO TE: $Revision: 1.6 $
+NO TE: $Date: 2007-08-23 05:48:22 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -72,9 +72,9 @@ ENDIF
 NO TE:  SETS AN OUTPUT IF ONE OR MORE BEAM STOPS ARE FULLY RAISED
 NO TE: OUTPUT 5 ON IF ONE OR MORE BEAMS TOPS RAISED
 IF (_LFC=0)|(_LFD=0)|(_LFE=0)|(_LFF=0)|(_LFG=0)
-SB 5
+SB1
 ELSE
-CB5
+CB1
 ENDIF
 JP #THREAD0
 EN