Commit 57a8a18e authored by flechsig's avatar flechsig
Browse files

rename OutPhase to outputs

parent 0018baf9
......@@ -431,29 +431,33 @@ record(bi, "$(P)$(R)Logscale_RBV")
field(SCAN, "I/O Intr")
}
record(mbbo, "$(P)$(R)OutputPhase")
record(mbbo, "$(P)$(R)Outputs")
{
field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))XGI_OUTPHASE")
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))XGI_OUTPUTS")
field(ZRVL, "0")
field(ZRST, "Amplitude")
field(ZRST, "default")
field(ONVL, "1")
field(ONST, "Phase")
field(ONST, "Amplitude")
field(TWVL, "2")
field(TWST, "unwrapped Phase")
field(TWST, "raw Phase")
field(THVL, "3")
field(THST, "unwrapped Phase")
field(PINI, "YES")
}
record(mbbi, "$(P)$(R)OutputPhase_RBV")
record(mbbi, "$(P)$(R)Outputs_RBV")
{
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))XGI_OUTPHASE")
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))XGI_OUTPUTS")
field(ZRVL, "0")
field(ZRST, "Amplitude")
field(ZRST, "default")
field(ONVL, "1")
field(ONST, "Phase")
field(ONST, "Amplitude")
field(TWVL, "2")
field(TWST, "unwrapped Phase")
field(TWST, "raw Phase")
field(THVL, "3")
field(THST, "unwrapped Phase")
field(SCAN, "I/O Intr")
}
......
......@@ -19,6 +19,6 @@ $(P)$(R)Minor
$(P)$(R)Center
$(P)$(R)Width
$(P)$(R)Logscale
$(P)$(R)OutputPhase
$(P)$(R)Outputs
$(P)$(R)Averages
file "NDPluginBase_settings.req", P=$(P), R=$(R)
......@@ -117,7 +117,7 @@ text {
object {
x=8
y=24
width=200
width=100
height=20
}
"basic attribute" {
......@@ -129,19 +129,19 @@ text {
object {
x=8
y=49
width=200
width=70
height=20
}
"basic attribute" {
clr=14
}
textix="OutputPhase"
textix="Outputs"
}
text {
object {
x=8
y=74
width=200
width=80
height=20
}
"basic attribute" {
......@@ -153,7 +153,7 @@ text {
object {
x=8
y=99
width=200
width=60
height=20
}
"basic attribute" {
......@@ -165,7 +165,7 @@ text {
object {
x=8
y=123
width=200
width=50
height=20
}
"basic attribute" {
......@@ -173,11 +173,23 @@ text {
}
textix="Width"
}
text {
object {
x=8
y=150
width=80
height=20
}
"basic attribute" {
clr=14
}
textix="Averages"
}
menu {
object {
x=213
y=24
width=101
x=123
y=25
width=140
height=20
}
control {
......@@ -188,22 +200,22 @@ menu {
}
menu {
object {
x=213
y=49
width=101
x=123
y=50
width=140
height=20
}
control {
chan="$(P)$(R)OutputPhase"
chan="$(P)$(R)Outputs"
clr=14
bclr=51
}
}
"choice button" {
object {
x=213
y=74
width=101
x=123
y=75
width=140
height=20
}
control {
......@@ -215,9 +227,9 @@ menu {
}
"text entry" {
object {
x=213
y=99
width=101
x=123
y=100
width=140
height=20
}
control {
......@@ -230,9 +242,9 @@ menu {
}
"text entry" {
object {
x=213
y=124
width=101
x=123
y=125
width=140
height=20
}
control {
......@@ -243,98 +255,11 @@ menu {
limits {
}
}
"text update" {
object {
x=318
y=24
width=110
height=20
}
monitor {
chan="$(P)$(R)Minor_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=318
y=49
width=110
height=20
}
monitor {
chan="$(P)$(R)OutputPhase_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=318
y=74
width=110
height=20
}
monitor {
chan="$(P)$(R)Logscale_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=318
y=99
width=110
height=20
}
monitor {
chan="$(P)$(R)Center_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=318
y=124
width=110
height=20
}
monitor {
chan="$(P)$(R)Width_RBV"
clr=14
bclr=5
}
limits {
}
}
text {
object {
x=8
y=150
width=200
height=20
}
"basic attribute" {
clr=14
}
textix="Averages"
}
"text entry" {
object {
x=213
y=151
width=101
x=123
y=152
width=140
height=20
}
control {
......@@ -345,18 +270,104 @@ text {
limits {
}
}
"text update" {
composite {
object {
x=318
y=151
width=110
height=20
}
monitor {
chan="$(P)$(R)Averages_RBV"
clr=14
bclr=5
}
limits {
x=290
y=24
width=155
height=147
}
"composite name"=""
children {
"text update" {
object {
x=290
y=24
width=155
height=20
}
monitor {
chan="$(P)$(R)Minor_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=290
y=49
width=155
height=20
}
monitor {
chan="$(P)$(R)Outputs_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=290
y=74
width=155
height=20
}
monitor {
chan="$(P)$(R)Logscale_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=290
y=99
width=155
height=20
}
monitor {
chan="$(P)$(R)Center_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=290
y=124
width=155
height=20
}
monitor {
chan="$(P)$(R)Width_RBV"
clr=14
bclr=5
}
limits {
}
}
"text update" {
object {
x=290
y=151
width=155
height=20
}
monitor {
chan="$(P)$(R)Averages_RBV"
clr=14
bclr=5
}
limits {
}
}
}
}
// Time-stamp: <13 Mar 19 16:34:58 flechsig>
// Time-stamp: <14 Mar 19 11:02:32 flechsig>
/*
* NDPluginXGI.cpp
*
......@@ -52,7 +52,7 @@ static const char *driverName="NDPluginXGI";
#define XGIPluginCenterString "XGI_CENTER" /* (asynInt32, r/w) FFT filter center */
#define XGIPluginWidthString "XGI_WIDTH" /* (asynInt32, r/w) FFT filter width */
#define XGIPluginLogscaleString "XGI_LOGSCALE" /* (asynInt32, r/w) logscale */
#define XGIPluginOutPhaseString "XGI_OUTPHASE" /* (asynInt32, r/w) phase output */
#define XGIPluginOutputsString "XGI_OUTPUTS" /* (asynInt32, r/w) phase output */
#define XGIPluginAveragesString "XGI_AVERAGES" /* (asynInt32, r/w) averages */
#define XGIPluginAverCountString "XGI_AVERCOUNT" /* (asynInt32, r/w) averages counter */
......@@ -103,7 +103,7 @@ private:
int XGIPluginCenter;
int XGIPluginWidth;
int XGIPluginLogscale;
int XGIPluginOutPhase;
int XGIPluginOutputs;
int XGIPluginAverages;
int XGIPluginAverCount;
// UF end
......@@ -168,7 +168,7 @@ void NDPluginXGI::processCallbacks(NDArray *pArray)
getIntegerParam(XGIPluginCenter, &this->XGIconfig.center);
getIntegerParam(XGIPluginWidth, &this->XGIconfig.width);
getIntegerParam(XGIPluginLogscale, &this->XGIconfig.logscale);
getIntegerParam(XGIPluginOutPhase, &this->XGIconfig.outphase);
getIntegerParam(XGIPluginOutputs, &this->XGIconfig.outputs);
getIntegerParam(XGIPluginAverages, &this->XGIconfig.averages);
/* Release the lock; this is computationally intensive and does not access any shared data */
......@@ -462,7 +462,7 @@ NDPluginXGI::NDPluginXGI(const char *portName, int queueSize, int blockingCallba
createParam(XGIPluginCenterString, asynParamInt32, &XGIPluginCenter);
createParam(XGIPluginWidthString, asynParamInt32, &XGIPluginWidth);
createParam(XGIPluginLogscaleString, asynParamInt32, &XGIPluginLogscale);
createParam(XGIPluginOutPhaseString, asynParamInt32, &XGIPluginOutPhase);
createParam(XGIPluginOutputsString, asynParamInt32, &XGIPluginOutputs);
createParam(XGIPluginAveragesString, asynParamInt32, &XGIPluginAverages);
createParam(XGIPluginAverCountString, asynParamInt32, &XGIPluginAverCount);
......
// File : /afs/psi.ch/user/f/flechsig/git/WFI/src/algorithms.cpp
// Date : <11 Feb 19 10:02:46 flechsig>
// Time-stamp: <13 Mar 19 16:41:05 flechsig>
// Time-stamp: <14 Mar 19 11:04:50 flechsig>
// Author : Flechsig Uwe, uwe.flechsig&#64;psi.&#99;&#104;
#include <iostream>
......@@ -86,11 +86,11 @@ void evalfft2d(Matrix *put_in, struct ConfigStruct *cstp, struct Xgi_out *put_ou
cout << "eval evalfft2d called" << endl;
#endif
put_in->copy(&put_out->amp); // copy input to output in field amp, address= 1
put_in->copy(&put_out->dphi_wrap);
put_in->copy(&put_out->amp); // copy input to output in field amp, address= 1
put_in->copy(&put_out->dphi_wrap); // copy input to output in field phase, address= 2
rows= put_in->height;
cols= put_in->width;
data= put_out->amp.data; // Array address= 1
data= put_out->amp.data; // Array address= 1
idxmax= rows* cols;
......@@ -406,7 +406,7 @@ void eval1d(double *data, int rows, int cols, struct ConfigStruct *cs, struct Xg
rowdir= cs->direction;
minor= cs->minor;
outphase= cs->outphase;
outphase= cs->outputs;
center= cs->center;
width= cs->width;
......@@ -548,7 +548,7 @@ void eval1d_zp(double *data, int rows, int cols, struct ConfigStruct *cs, struct
rowdir= cs->direction;
minor= cs->minor;
outphase= cs->outphase;
outphase= cs->outputs;
center= cs->center;
width=cs->width;
......@@ -864,7 +864,7 @@ void myoverlay(Matrix *put_in, struct ConfigStruct *cstp, struct Xgi_out *put_ou
rows= put_in->height;
cols= put_in->width;
switch (cstp->outphase)
switch (cstp->outputs)
{
case 0: m= &put_out->amp; break;
case 1: m= &put_out->dphi_wrap; break;
......@@ -969,7 +969,7 @@ void ReadConfig(struct ConfigStruct *cs)
cs->zeropadding= 19990101;
cs->zeropadding= 1;
cs->mytestdouble= 2.1;
cs->outphase= 0;
cs->outputs= 0;
cs->logscale= 0;
cs->averages= 1;
......
/* File : /afs/psi.ch/user/f/flechsig/git/WFI/src/algorithms.h */
/* Date : <11 Feb 19 10:03:58 flechsig> */
/* Time-stamp: <20 Feb 19 16:33:36 flechsig> */
/* Time-stamp: <14 Mar 19 11:03:35 flechsig> */
/* Author : Flechsig Uwe, uwe.flechsig&#64;psi.&#99;&#104; */
#ifndef ALGORITMS_H
......@@ -25,7 +25,7 @@ struct ConfigStruct {
int direction;
int logscale;
int minor;
int outphase;
int outputs;
int version;
int width;
int zeropadding;
......
Markdown is supported
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