fixes: helicalcoord system, EVR

This commit is contained in:
2018-11-27 12:10:15 +01:00
parent f08cba548e
commit d16249d863
4 changed files with 6 additions and 18 deletions

View File

@@ -756,7 +756,7 @@ class HelicalScan(MotionBase):
gt=self.gather
gt.set_phasemode(False)
#gt.set_address("Motor[4].ActPos","Motor[5].ActPos","Motor[3].ActPos","Motor[1].ActPos")
gt.set_address("Motor[4].ActPos","Motor[5].ActPos","Motor[3].ActPos","Motor[1].ActPos","Gate3[1].Chan[0].UserFlag")
gt.set_address("Motor[4].ActPos","Motor[5].ActPos","Motor[3].ActPos","Motor[1].ActPos","Gate3[1].Chan[1].UserFlag")
gt.set_property(MaxSamples=1000000, Period=acq_per)
ServoPeriod= .2 #0.2ms #Sys.ServoPeriod is dependent of !common() macro
#ServoPeriod=comm.gpascii.servo_period
@@ -779,6 +779,8 @@ a
#5->I
#3->I
#1->I
Motor[4].MaxSpeed=8
Motor[5].MaxSpeed=8
'''
pbParam=param.copy()
sh=pbParam.shape
@@ -789,7 +791,7 @@ a
subsParam=dict(map(lambda k, i, v: (k + '_' + str(i), v), s * sh[0], c, pbParam.reshape(-1)))
subsParam['d2r']=d2r/1000.
subsParam['r2d']=1000./d2r
subsParam['cmt']='' #'//'
subsParam['cmt']='//'#''
subs={'qCX':'L4', 'qCZ':'L5', 'qW':'L3', 'qFY':'L1',