Skip to content

Commit 03e4d5d

Browse files
committed
gmode
1 parent 515a235 commit 03e4d5d

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

igor_code_mfp_branch/GModeImaging.ipf

+19-10
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,13 @@ Function ImageScanGmode(xpos, ypos, liftheight, scansizeX,scansizeY, scanlines,
494494

495495
i=0
496496
do
497+
498+
// ENODE stuff
499+
error+= td_xsetoutwavepair(0,"Event.0,repeat", "Output.A", lightwave,"Output.B", voltagewave,-1)
500+
loadarbwave(1000, 5, 2.5, polarity=0)
501+
Sleep/S 3
502+
//
503+
497504
starttime2 =StopMSTimer(-2) //Start timing the raised scan line
498505
print "line ", i+1
499506

@@ -509,17 +516,14 @@ Function ImageScanGmode(xpos, ypos, liftheight, scansizeX,scansizeY, scanlines,
509516
td_StopInWaveBank(-1)
510517
td_StopOutWaveBank(-1)
511518

512-
error+= td_xSetInWave(0,"Event.0", "ZSensor", ReadWaveZ,"", Downinterpolation)// used during Trace to record height data
513-
if (error != 0)
514-
print i, "error1", error
515-
endif
516-
517-
error+= td_xSetOutWavePair(0,"Event.0", "PIDSLoop.0.Setpoint", Xdownwave,"PIDSLoop.1.Setpoint",Ydownwave ,-DownInterpolation)
518-
if (error != 0)
519-
print i, "error2", error
520-
endif
521-
519+
// error+= td_xSetInWave(0,"Event.0", "ZSensor", ReadWaveZ,"", Downinterpolation)// used during Trace to record height data
520+
// error+= td_xSetOutWavePair(0,"Event.0", "PIDSLoop.0.Setpoint", Xdownwave,"PIDSLoop.1.Setpoint",Ydownwave ,-DownInterpolation)
522521

522+
//ENODE Stuff
523+
error+= td_xSetInWave(0,"Event.0", "ZSensor", ReadWaveZ,"", -UpInterpolation)// used during Trace to record height data
524+
error+= td_xSetOutWavePair(0,"Event.0", "PIDSLoop.0.Setpoint", Xdownwave,"PIDSLoop.1.Setpoint",Ydownwave ,-UpInterpolation)
525+
//
526+
523527
SetPassFilter(1,q = ImagingFilterFreq, i = ImagingFilterFreq)
524528

525529
td_wv(LockinString + "Amp",CalHardD)
@@ -555,6 +559,11 @@ Function ImageScanGmode(xpos, ypos, liftheight, scansizeX,scansizeY, scanlines,
555559
td_stopInWaveBank(-1)
556560
td_stopOutWaveBank(-1)
557561

562+
//ENODE Stuff
563+
loadpulsewave(100, 2, 0.003, 1)
564+
Sleep/S 3
565+
//
566+
558567
// Outputs three signals from the ARC. If CutDrive is active, then "trigger" is replaced by the drive signal to the shake pieze
559568
// Otherwise, the outputs are:
560569
// BNC0 : triggerwave

0 commit comments

Comments
 (0)