From 77142b2ae768de42735606a419990a6aa9d1f8c4 Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-1.psi.ch>
Date: Tue, 23 Jan 2018 11:06:55 +0100
Subject: [PATCH] Closedown

---
 config/plugins.properties |  1 +
 script/scans/6mom.py      | 73 ---------------------------------------
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 script/scans/6mom.py

diff --git a/config/plugins.properties b/config/plugins.properties
index 32e2b9c..18a681e 100644
--- a/config/plugins.properties
+++ b/config/plugins.properties
@@ -1 +1,2 @@
+Omega.java=enabled
 Pilatus.java=enabled
diff --git a/script/scans/6mom.py b/script/scans/6mom.py
deleted file mode 100644
index 8cc08e7..0000000
--- a/script/scans/6mom.py
+++ /dev/null
@@ -1,73 +0,0 @@
-startphi=-10
-endphi=0		# for DACs the middle is 57
-time_step=1
-step=0.5		# in degrees
-passes = 1
-fname='test6mom'	# remember the run number
-
-
-
-startphi, endphi, time_step, step = float(startphi), float(endphi), float(time_step), float(step)
-#TODO: Should not move to startphi?
-scr.setSpeed (5.0)
-scr.move(startphi, 60000)
-
-filt=caget("X04SA-ES2-FI:TRANSM",'d') *1000000000  
-caput("X04SA-ES2-PIL:cam1:FilterTransm",filt)
-
-exp_time = time_step -0.003			# calculates Exposure time
-phitot = endphi - startphi 			# calculates total omega span
-images = int(phitot/step)    		# calculates number of images  #TODO: floor or ceil?
-velo = step/time_step
-if velo > 5.0:
-    raise Exception("Too fast velocity calculated for the motor, please change")
-
-scr.setSpeed(velo)                  # speed of the omega axis in deg/s
-tottime = time_step * images + 5  	# calculates total time needed, adds 5 for safety
-print "Total time: ", tottime 				
-print "Collecting ", fname, "..."
-
-# THE FOLLOWING LINES SEND COMMANDS TO THE CAMSERVER 
-det.numImages = images		# number of images
-det.exposure	= exp_time		# Exposure time 
-det.acquirePeriod	= time_step	# Acquire period
-
-
-### FORWARD ###
-# PLEASE NOTE THE FOLLOWING HAS NOT YET BEEN UPDATED FOR AUTOMATIC ANGLES
-
-det.chi     	= 90
-det.chiIncr     = 0.0
-det.omega 	    = 57.05		# initial angle
-det.omegaIncr   = 0.0 		# increment angle
-det.angleIncr 	= step		# might be redundant
-det.kappa 	    = -134.76	# kappa
-det.phi 		= 57.045	# phi
-
-
-for p in range(passes):
-    if p % 2 == 0:
-        det.phiIncr     = step
-        det.startAngle  = startphi	# might be redundant
-        scr.moveAsync(endphi)
-        det.fileName   = (fname + str(p)) if (passes > 1) else fname		# filename        
-    else :
-        det.phiIncr     = -step
-        det.startAngle  = endphi	# might be redundant
-        scr.moveAsync(startphi)
-        det.fileName   =fname + str(p)		# filename
-    det.fileNumber = 1			# always start with image 1
-    sleep (1.0)
-
-    try:        
-        det.start()
-        #sleep(tottime)
-        scr.waitReady(int(tottime * 1000))        
-    except:
-        scr.stop()
-        det.stop()
-        raise
-
-scr.setSpeed (5.0)
-scr.move(startphi, 30000) #timeout = 30.0s
-