Skip to content
Snippets Groups Projects
Commit 25479b0b authored by Your Name's avatar Your Name
Browse files

Fix bug with the shift/reduce the motor speed

parent 81560bd6
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
db/EMU.substitutions
+ 14
− 0
View file @ 25479b0b
...@@ -534,6 +534,20 @@ pattern {P, M, NAME, DESC, EGU, VARIABLE, PREC, SCAN, SPORT} ...@@ -534,6 +534,20 @@ pattern {P, M, NAME, DESC, EGU, VARIABLE, PREC, SCAN, SPORT}
{LNS-ISRC-010,PBI-EM,CURRENT_ERR,"current to high", boolean, P93, 0, "0.5 second", GEOBRICK_ASYN} {LNS-ISRC-010,PBI-EM,CURRENT_ERR,"current to high", boolean, P93, 0, "0.5 second", GEOBRICK_ASYN}
{LNS-ISRC-010,PBI-EMV,SWITCH_H,"Vertical high motor swicth", boolean, M121, 0, "0.5 second", GEOBRICK_ASYN} {LNS-ISRC-010,PBI-EMV,SWITCH_H,"Vertical high motor swicth", boolean, M121, 0, "0.5 second", GEOBRICK_ASYN}
{LNS-ISRC-010,PBI-EMV,SWITCH_L,"Vertical low motor swicth", boolean, M122, 0, "1 second", GEOBRICK_ASYN} {LNS-ISRC-010,PBI-EMV,SWITCH_L,"Vertical low motor swicth", boolean, M122, 0, "1 second", GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_BRAKE "0: brake on, 1: brake off" boolean M33 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_SWITCH_H "Vertical high motor swicth" boolean M121 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_SWITCH_L "Vertical low motor swicth" boolean M122 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_M_IN_POSITION "Vertical low motor swicth" boolean M140 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_HOME_DONE "Vertical low motor swicth" boolean P101 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_M_POSITION "Vertical motor position" cts #1P 0 ".1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_ACTUAL_VEL "Actual average velocity" boolean M174 0 ".1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_QUA_CUR_LOOP "Quadrature cur-loop inte" boolean M177 0 ".1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_AMP_FAULT "Amplifier-fault-error bit" boolean M143 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_INT_FOL_ERR "Integrated follow. error" boolean M146 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_I2T_FAULT "I2T fault bit" boolean M147 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER V_PHASING_ERR "Phasing error fault" boolean M148 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER GEOBRICK_ERR "M143|M146|M147|M148|M243.." boolean P92 0 "1 second" GEOBRICK_ASYN}
{SOURCE EMITTANCE-METTER CURRENT_ERR "current to high" boolean P93 0 "1 second" GEOBRICK_ASYN}
} }
......
db/EMU_PROCESS.template
+ 3
− 0
View file @ 25479b0b
...@@ -105,6 +105,9 @@ record(seq,"$(DEVICE):PROC-PS-AF"){ ...@@ -105,6 +105,9 @@ record(seq,"$(DEVICE):PROC-PS-AF"){
field(DO2,"1") field(DO2,"1")
field(LNK3,"$(DEVICE):BUFF-DET23-FUNC.PROC PP") field(LNK3,"$(DEVICE):BUFF-DET23-FUNC.PROC PP")
field(DO3,"1") field(DO3,"1")
field(LNK4,"$(DEVICE):$(SCAN_EF).AWAIT PP")
field(DO4,"0")
field(DLY4,"0.1")
} }
record(seq,"$(DEVICE):PROC-SLIT-BF"){ record(seq,"$(DEVICE):PROC-SLIT-BF"){
......
logs.0
+ 45
− 101
View file @ 25479b0b
2016-12-08 11:51:39.534 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - 2017-01-25 11:51:49.460 SEVERE [Thread 1] org.csstudio.logging.PluginLogListener (logging) - Unhandled event loop exception
2016-12-08 11:51:40.413 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/1-Home.opi org.eclipse.swt.SWTException: Failed to execute runnable (java.lang.NullPointerException)
2016-12-08 11:51:40.924 WARNING [Thread 34] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png at org.eclipse.swt.SWT.error(SWT.java:4441)
com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory) at org.eclipse.swt.SWT.error(SWT.java:4356)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832) at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:139)
at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87) at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3774)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3412)
Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory) at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$9.run(PartRenderingEngine.java:1151)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53) at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1032)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1) at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:148)
at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527) at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:636)
at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319) at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:579)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:150)
at com.google.common.cache.LocalCache.get(LocalCache.java:3937) at org.csstudio.utility.product.Workbench.runWorkbench(Workbench.java:103)
at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941) at org.csstudio.startup.application.Application.startApplication(Application.java:264)
at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824) at org.csstudio.startup.application.Application.start(Application.java:118)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830) at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
... 2 more at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:134)
Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104)
at java.io.FileInputStream.open0(Native Method) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:380)
at java.io.FileInputStream.open(FileInputStream.java:195) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:235)
at java.io.FileInputStream.<init>(FileInputStream.java:138) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
... 12 more at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
2016-12-08 11:52:18.977 WARNING [Thread 28] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:648)
com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:603)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832) at org.eclipse.equinox.launcher.Main.run(Main.java:1465)
at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87) at org.eclipse.equinox.launcher.Main.main(Main.java:1438)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) Caused by: java.lang.NullPointerException
Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory) at org.csstudio.swt.widgets.figureparts.ROIFigure.getGeoBoundsFromROI(ROIFigure.java:507)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138) at org.csstudio.swt.widgets.figureparts.ROIFigure.updateROIGeoBounds(ROIFigure.java:488)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53) at org.csstudio.swt.widgets.figureparts.ROIFigure.access$3(ROIFigure.java:487)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1) at org.csstudio.swt.widgets.figureparts.ROIFigure$3.croppedDataSizeChanged(ROIFigure.java:363)
at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527) at org.csstudio.swt.widgets.figures.IntensityGraphFigure.updateCroppedDataSize(IntensityGraphFigure.java:1609)
at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319) at org.csstudio.swt.widgets.figures.IntensityGraphFigure.setDataWidth(IntensityGraphFigure.java:1419)
at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282) at org.csstudio.opibuilder.widgets.editparts.IntensityGraphEditPart$8.handleChange(IntensityGraphEditPart.java:244)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197) at org.csstudio.opibuilder.properties.WidgetPropertyChangeListener$1.run(WidgetPropertyChangeListener.java:53)
at com.google.common.cache.LocalCache.get(LocalCache.java:3937) at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35)
at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941) at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:136)
at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824) ... 26 more
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
... 2 more
Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
at java.io.FileInputStream.open0(Native Method)
at java.io.FileInputStream.open(FileInputStream.java:195)
at java.io.FileInputStream.<init>(FileInputStream.java:138)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
... 12 more
2016-12-08 11:52:57.228 WARNING [Thread 28] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
... 2 more
Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
at java.io.FileInputStream.open0(Native Method)
at java.io.FileInputStream.open(FileInputStream.java:195)
at java.io.FileInputStream.<init>(FileInputStream.java:138)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
... 12 more
2016-12-08 11:54:50.050 WARNING [Thread 61] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
... 2 more
Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
at java.io.FileInputStream.open0(Native Method)
at java.io.FileInputStream.open(FileInputStream.java:195)
at java.io.FileInputStream.<init>(FileInputStream.java:138)
at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
... 12 more
2017-01-25 11:51:49.461 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/1-Home.opi
2017-01-25 11:53:41.238 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) -
logs.0.lck 0 → 100644
+ 0
− 0
View file @ 25479b0b
logs.1
+ 133
− 109
View file @ 25479b0b
This diff is collapsed.
opi/EMU.opi
+ 10385
− 10406
View file @ 25479b0b
This diff is collapsed.
opi/Scripts/ExtracData.py
+ 11
− 11
View file @ 25479b0b
...@@ -64,23 +64,23 @@ except IndexError : ...@@ -64,23 +64,23 @@ except IndexError :
## ANGLES ## ANGLES
PlotFile.write("\nvecteur angles (mrad) : ") PlotFile.write("\nvecteur angles (mrad) : ")
indAngle=NbPos-1 indAngle=0
for value in range(0,NbAngle): for value in range(0,NbAngle):
PlotFile.write("%.2f "%tabAng[indAngle]); PlotFile.write("%.2f "%tabAng[indAngle]);
indAngle=indAngle+NbPos indAngle=indAngle+NbPos
PlotFile.write("\ntype d'ion : PROTON...") PlotFile.write("\ntype d'ion : PROTON...")
PlotFile.write("\ncolonnes de 1 a 4 : indice de temps / indice position / indice angle / I [Volt] :\n") PlotFile.write("\ncolonnes de 1 a 4 : indice de temps / indice position / indice angle / I [Volt] :\n")
## POSITION/ANGLE/INTENSITY ## POSITION/ANGLE/INTENSITY
indCurrent=NbPos-1 indCurrent=0
indPos=NbPos indPos=0
for valuePos in range(0,NbPos): for valuePos in range(0,NbPos):
for valueAngle in range(0,NbAngle): for valueAngle in range(0,NbAngle):
PlotFile.write("0\t%i\t%i\t%.4f\n" %(valuePos,valueAngle,tabCurr[indCurrent])); PlotFile.write("0\t%i\t%i\t%.4f\n" %(valuePos,valueAngle,tabCurr[indCurrent]));
indCurrent=indCurrent+NbPos indCurrent=indCurrent+NbPos
indPos=indPos-1 indPos=indPos+1
indCurrent=indPos-1 indCurrent=indPos
PlotFile.close() PlotFile.close()
...@@ -93,16 +93,16 @@ PlotFile.close() ...@@ -93,16 +93,16 @@ PlotFile.close()
PlotFile = open(home+'/data/emit/averageDataEmit/'+"avg-"+NameFile, 'w+') PlotFile = open(home+'/data/emit/averageDataEmit/'+"avg-"+NameFile, 'w+')
## POSITION/ANGLE/INTENSITY ## POSITION/ANGLE/INTENSITY
indAngle=NbPos-1 indAngle=0
indCurrent=NbPos-1 indCurrent=0
indPos=NbPos indPos=0
try: try:
for valuePos in range(0,(NbPos)): for valuePos in range(0,(NbPos)):
for valueAngle in range(0,NbAngle): for valueAngle in range(0,NbAngle):
PlotFile.write("\n%.2f\t\t%.2f\t\t%.4f\n " %(tabPos[valuePos],tabAng[indAngle],tabCurr[indCurrent])); PlotFile.write("\n%.2f\t\t%.2f\t\t%.8f\n " %(tabPos[valuePos],tabAng[indAngle],tabCurr[indCurrent]));
indAngle=indAngle+NbPos indAngle=indAngle+NbPos
indCurrent=indCurrent+NbPos indCurrent=indCurrent+NbPos
indPos=indPos-1 indPos=indPos+1
indAngle=indPos indAngle=indPos
indCurrent=indPos indCurrent=indPos
except IndexError : except IndexError :
......
src/EMU_CALCULS.c
+ 18
− 3
View file @ 25479b0b
...@@ -116,20 +116,35 @@ static int CREATE_TAB(aSubRecord *precord) { ...@@ -116,20 +116,35 @@ static int CREATE_TAB(aSubRecord *precord) {
ptr_WF_REENT++; ptr_WF_REENT++;
} }
} }
/*******************************************************/
/***** FILL new DATA ******/ /***** FILL new DATA ******/
if(mtr_cpt>=0) /* if(mtr_cpt>=0)
{ {
cpt_for=nbPosition-mtr_cpt-1; cpt_for=nbPosition-mtr_cpt-1;
ptr_WF_OUT=(float*)(precord->vala); ptr_WF_OUT=(float*)(precord->vala);
ptr_WF_OUT=ptr_WF_OUT+cpt_for; ptr_WF_OUT=ptr_WF_OUT+cpt_for;
ptr_WF = (float *)precord->a;*/
/*DATA from the COMPRESS waveform */
/* for (i = 0 ; i <= nbAngle; ++i)
{
*ptr_WF_OUT=*ptr_WF;
ptr_WF_OUT=ptr_WF_OUT+nbPosition;
ptr_WF++;
}
}*/
/***** FILL new DATA ******/
if(mtr_cpt>=0)
{
ptr_WF_OUT=(float*)(precord->vala)+mtr_cpt;
ptr_WF = (float *)precord->a; ptr_WF = (float *)precord->a;
/*DATA from the COMPRESS waveform */ /*DATA from the COMPRESS waveform */
for (i = 0 ; i <= nbAngle; ++i) for (i = 0 ; i <= nbAngle; ++i)
{ {
*ptr_WF_OUT=*ptr_WF; *ptr_WF_OUT=*ptr_WF;
ptr_WF_OUT=ptr_WF_OUT+nbPosition; ptr_WF_OUT=ptr_WF_OUT+nbPosition;
ptr_WF++; ptr_WF++;
} }
......
startup/EMU.cmd
+ 10
− 9
View file @ 25479b0b
...@@ -26,7 +26,7 @@ epicsEnvSet("PREC", "4" ) ...@@ -26,7 +26,7 @@ epicsEnvSet("PREC", "4" )
epicsEnvSet("DHLM", "4" ) epicsEnvSet("DHLM", "4" )
epicsEnvSet("DLLM", "-200" ) epicsEnvSet("DLLM", "-200" )
epicsEnvSet("VELO", "1.5" ) epicsEnvSet("VELO", "1.5" )
epicsEnvSet("HVEL", "2" ) epicsEnvSet("HVEL", "1.5" )
epicsEnvSet("VBAS", "0.1" ) epicsEnvSet("VBAS", "0.1" )
epicsEnvSet("VMAX", "7" ) epicsEnvSet("VMAX", "7" )
epicsEnvSet("ACCL", "10" ) epicsEnvSet("ACCL", "10" )
...@@ -66,16 +66,16 @@ epicsEnvSet("EVR_PUL0_WIDTH", "$(EVR_EV14_OUT0_WIDTH=1000)") ...@@ -66,16 +66,16 @@ epicsEnvSet("EVR_PUL0_WIDTH", "$(EVR_EV14_OUT0_WIDTH=1000)")
#DAQ macros #DAQ macros
epicsEnvSet("DAQPREFIX", "LNS-ISRC-010" ) epicsEnvSet("DAQPREFIX", "LNS-ISRC-010" )
epicsEnvSet("DAQBUFSIZE", "1024" ) epicsEnvSet("DAQBUFSIZE", "1024" )
epicsEnvSet("BUFFERSIZE", "20000" ) epicsEnvSet("BUFFERSIZE", "40000" )
#Scanning macros #Scanning macros
epicsEnvSet("SCANPREFIX", "LNS-ISRC-010:PBI-EMV" ) epicsEnvSet("SCANPREFIX", "LNS-ISRC-010:PBI-EMV" )
epicsEnvSet("SCAN_SLIT", "MTR" ) epicsEnvSet("SCAN_SLIT", "MTR" )
epicsEnvSet("SCAN_EF", "PS" ) epicsEnvSet("SCAN_EF", "PS" )
epicsEnvSet("SCAN_POINTS_EF", "1000" ) epicsEnvSet("SCAN_POINTS_EF", "400" )
epicsEnvSet("SCAN_POINTS_SLIT", "100" ) epicsEnvSet("SCAN_POINTS_SLIT", "100" )
epicsEnvSet(EPICS_CA_MAX_ARRAY_BYTES, 4000000) epicsEnvSet(EPICS_CA_MAX_ARRAY_BYTES, 8000000)
# Connection to PMAC and setup for $(NUM_MOTORS) motors # Connection to PMAC and setup for $(NUM_MOTORS) motors
pmacAsynIPConfigure($(PMACPORT), "10.10.3.42:1025") pmacAsynIPConfigure($(PMACPORT), "10.10.3.42:1025")
...@@ -216,12 +216,12 @@ dbpf $(DAQPREFIX):PBI-EM:CARD0:SAMPLINGRATE 1000000 ...@@ -216,12 +216,12 @@ dbpf $(DAQPREFIX):PBI-EM:CARD0:SAMPLINGRATE 1000000
# Initialize Motor positioners # Initialize Motor positioners
dbpf $(SCANPREFIX):$(SCAN_SLIT).P4SP -110 dbpf $(SCANPREFIX):$(SCAN_SLIT).P4SP -110
dbpf $(SCANPREFIX):$(SCAN_SLIT).P4EP -190 dbpf $(SCANPREFIX):$(SCAN_SLIT).P4EP -190
dbpf $(SCANPREFIX):$(SCAN_SLIT).P2SP 2 dbpf $(SCANPREFIX):$(SCAN_SLIT).P2SP 1.5
dbpf $(SCANPREFIX):$(SCAN_SLIT).P2EP 2 dbpf $(SCANPREFIX):$(SCAN_SLIT).P2EP 1.5
dbpf $(SCANPREFIX):$(SCAN_SLIT).P1SP 4 dbpf $(SCANPREFIX):$(SCAN_SLIT).P1SP 5
dbpf $(SCANPREFIX):$(SCAN_SLIT).P1EP 4 dbpf $(SCANPREFIX):$(SCAN_SLIT).P1EP 5
dbpf $(SCANPREFIX):$(SCAN_SLIT).NPTS 11 dbpf $(SCANPREFIX):$(SCAN_SLIT).NPTS 11
dbpf $(SCANPREFIX):$(SCAN_SLIT).PDLY 0.1 #dbpf $(SCANPREFIX):$(SCAN_SLIT).PDLY 0.1
# Initialize Power supply positioners # Initialize Power supply positioners
dbpf $(SCANPREFIX):PROC-AngleMax-SP 80 dbpf $(SCANPREFIX):PROC-AngleMax-SP 80
...@@ -229,6 +229,7 @@ dbpf $(SCANPREFIX):PROC-AngleMin-SP -80 ...@@ -229,6 +229,7 @@ dbpf $(SCANPREFIX):PROC-AngleMin-SP -80
dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 200 dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 200
dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 0.04 dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 0.04
dbpf $(SCANPREFIX):$(SCAN_EF).DDLY 0.02 dbpf $(SCANPREFIX):$(SCAN_EF).DDLY 0.02
dbpf $(SCANPREFIX):$(SCAN_EF).AAWAIT 1
dbpf $(DAQPREFIX):PBI-EM:CARD0:TriggerEdge 1 dbpf $(DAQPREFIX):PBI-EM:CARD0:TriggerEdge 1
dbpf $(DAQPREFIX):PBI-EM:CARD0:NSAMPLES_ms 7 dbpf $(DAQPREFIX):PBI-EM:CARD0:NSAMPLES_ms 7
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment