diff --git a/Readme.md b/Readme.md index 0e7aa9a..fff3895 100644 --- a/Readme.md +++ b/Readme.md @@ -1159,18 +1159,3 @@ caput SAR-CVME-TIFALL5-EVG0:SoftEvt-EvtCode-SP 254 ``` -TODO ----- -``` -adapt speed -- change pvt value (simple but fix) - -make longer acquisition time by enhancing the gather server - - - - - -``` - - diff --git a/evr_PCIe-300DC.subs b/evr_PCIe-300DC.subs index 482b5b0..4a3e9d7 100644 --- a/evr_PCIe-300DC.subs +++ b/evr_PCIe-300DC.subs @@ -249,7 +249,7 @@ file "$(mrfioc2_TEMPLATES=db)/evr-pcie-300DC.db" FrontUnivOut5-Name-I="" # Description of the output. Maximum 40 characters allowed! FrontUnivOut5-Name-I.DESC="" # Secondary description of the output. Maximum 40 characters allowed! FrontUnivOut5-Ena-SP=1, # Default to enabled - FrontUnivOut5-Src-SP=63, # Defaults to Force low (if enabled -> Ena-SP) + FrontUnivOut5-Src-SP=1, # Defaults to Force low (if enabled -> Ena-SP) FrontUnivOut5-Src2-SP=63, # Defaults to Force low (if enabled -> Ena-SP) # Slot 3 diff --git a/python/helicalscan.py b/python/helicalscan.py index 5ec77ec..77240ac 100755 --- a/python/helicalscan.py +++ b/python/helicalscan.py @@ -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', diff --git a/python/shapepath.py b/python/shapepath.py index 8ede8a0..ac0ed1a 100755 --- a/python/shapepath.py +++ b/python/shapepath.py @@ -631,6 +631,7 @@ if __name__=='__main__': #setup_sync(self, crdId=1, prgId=2, plcId=2, mode=0, **kwargs): #sp.setup_sync() #no sync at all #sp.setup_sync(mode=1) #sync with timing system (PROG) + sp.setup_coord_trf() # reset to shape path system sp.setup_sync(mode=2) #sync with timing system and PLC to sync speed (PROG) #sp.gen_grid_points(w=2,h=2,pitch=50,rnd=.2);sp.sort_points(xy);sp.setup_motion(fnPrg=fn+'.prg',mode=1,pt2pt_time=10,acq_per=1)