Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hide some parameters

Browse Source
This commit is contained in:
Chris Milne
2018-06-30 23:37:50 +02:00
parent 343573f888
commit 07e028ed20
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xoptics/dcm.py
+11 -11
View File
@@ -162,15 +162,15 @@ class AlvraDCM_FEL:
self.Id = Id
self.name = 'Alvra DCM monochromator coupled to FEL beam'
# self.IOCstatus = PV('ALVRA:running') # bool 0 running, 1 not running
self.FELcoupling = PV('SGE-OP2E-ARAMIS:MODE_SP') # string "Off" or "e-beam"
self.setEnergy = PV('SAROP11-ARAMIS:ENERGY_SP_USER') # float eV
self.getEnergy = PV('SAROP11-ARAMIS:ENERGY') # float eV
self._FELcoupling = PV('SGE-OP2E-ARAMIS:MODE_SP') # string "Off" or "e-beam"
self._setEnergy = PV('SAROP11-ARAMIS:ENERGY_SP_USER') # float eV
self._getEnergy = PV('SAROP11-ARAMIS:ENERGY') # float eV
self.ebeamEnergy = PV('SARCL02-MBND100:P-READ') # float MeV/c
# self.ebeamEnergySP = PV('ALVRA:Energy_SP') # float MeV
self.dcmStop = PV('SAROP11-ODCM105:STOP.PROC') # stop the DCM motors
self.dcmMoving = PV('SAROP11-ODCM105:MOVING') # DCM moving field
self.energyChanging = PV('SGE-OP2E-ARAMIS:MOVING') # PV telling you something related to the energy is changing
self.alvraMode = PV('SAROP11-ARAMIS:MODE') # string Aramis SAROP11 mode
self._energyChanging = PV('SGE-OP2E-ARAMIS:MOVING') # PV telling you something related to the energy is changing
self._alvraMode = PV('SAROP11-ARAMIS:MODE') # string Aramis SAROP11 mode
self.ebeamOK = PV('SFB_BEAM_ENERGY_ECOL:SUM-ERROR-OK') # is ebeam no longer changing
self.photCalib1 = PV('SGE-OP2E-ARAMIS:PH2E_X1') # photon energy calibration low calibration point
self.photCalib2 = PV('SGE-OP2E-ARAMIS:PH2E_X2') # photon energy calibration high calibration point
@@ -183,9 +183,9 @@ class AlvraDCM_FEL:
# iocStr = "Soft IOC running"
# else:
# iocStr = "Soft IOC not running"
FELcouplingStr = self.FELcoupling.get(as_string=True)
alvraModeStr = self.alvraMode.get(as_string=True)
currEnergy = self.getEnergy.get()
FELcouplingStr = self._FELcoupling.get(as_string=True)
alvraModeStr = self._alvraMode.get(as_string=True)
currEnergy = self._getEnergy.get()
currebeamEnergy = self.ebeamEnergy.get()
photCalib1Str = self.photCalib1.get()
photCalib2Str = self.photCalib2.get()
@@ -208,18 +208,18 @@ class AlvraDCM_FEL:
return s
def get_current_value(self):
return self.getEnergy.get()
return self._getEnergy.get()
def move_and_wait(self,value,checktime=.1,precision=0.5):
self.FELcoupling.put(1) # ensure the FEL coupling is turned on
self.setEnergy.put(value)
self._setEnergy.put(value)
# while self.ebeamOK.get()==0:
# sleep(checktime)
# while abs(self.ebeamEnergy.get()-self.ebeamEnergySP.get())>precision:
# sleep(checktime)
# while self.dcmMoving.get()==1:
# sleep(checktime)
while self.energyChanging == 1:
while self._energyChanging == 1:
sleep(checktime)
def changeTo(self,value,hold=False):