Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions AOloopControl/modalCTRL_stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,25 +140,28 @@ static errno_t compute_function()
read_sharedmem_image(name, data.core.image, data.core.NB_MAX_IMAGE);
imgtbuff_mvalDM = imgid_make_from_name(name);
resolveIMGID(
&imgtbuff_mvalDM, ERRMODE_ABORT,
&imgtbuff_mvalDM, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgtbuff_mvalDM.ID == -1) return RETURN_FAILURE;

WRITE_IMAGENAME(name, "aol%lu_modevalWFS_buff", *AOloopindex);
read_sharedmem_image(name, data.core.image, data.core.NB_MAX_IMAGE);
imgtbuff_mvalWFS = imgid_make_from_name(name);
resolveIMGID(
&imgtbuff_mvalWFS, ERRMODE_ABORT,
&imgtbuff_mvalWFS, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgtbuff_mvalWFS.ID == -1) return RETURN_FAILURE;

WRITE_IMAGENAME(name, "aol%lu_modevalOL_buff", *AOloopindex);
read_sharedmem_image(name, data.core.image, data.core.NB_MAX_IMAGE);
imgtbuff_mvalOL = imgid_make_from_name(name);
resolveIMGID(
&imgtbuff_mvalOL, ERRMODE_ABORT,
&imgtbuff_mvalOL, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgtbuff_mvalOL.ID == -1) return RETURN_FAILURE;

NBmode = imgtbuff_mvalOL.md->size[0];
NBsample = imgtbuff_mvalOL.md->size[1];
Expand Down
3 changes: 2 additions & 1 deletion AOloopControl/modalfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,9 @@ static errno_t compute_function()
IMGID imginWFS =
imgid_make_from_fpskey(
inmval, FPS_name, ".inmval");
resolveIMGID(&imginWFS, ERRMODE_ABORT,
resolveIMGID(&imginWFS, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imginWFS.ID == -1) return RETURN_FAILURE;

uint32_t NBmode = imginWFS.md[0].size[0];

Expand Down
6 changes: 4 additions & 2 deletions AOloopControl/modalfilter_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,21 @@ static errno_t compute_function()
//
IMGID imgmvalDM = imgid_make_from_name(mvalDM);
resolveIMGID(
&imgmvalDM, ERRMODE_ABORT,
&imgmvalDM, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgmvalDM.ID == -1) return RETURN_FAILURE;
printf("%u modes\n", imgmvalDM.md->size[0]);
uint32_t NBmode = imgmvalDM.md->size[0];

// Connect to mvalWFS
//
IMGID imgmvalWFS = imgid_make_from_name(mvalWFS);
resolveIMGID(
&imgmvalWFS, ERRMODE_ABORT,
&imgmvalWFS, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgmvalWFS.ID == -1) return RETURN_FAILURE;


// connect / create mvalC
Expand Down
24 changes: 16 additions & 8 deletions AOloopControl/modalstatsTUI.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,9 @@ errno_t AOloopControl_modalstatsTUI(
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_modevalWFS", loopindex);
imgmodevalWFS = imgid_make_from_name(name);
resolveIMGID(&imgmodevalWFS, ERRMODE_ABORT,
resolveIMGID(&imgmodevalWFS, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmodevalWFS.ID == -1) return RETURN_FAILURE;
NBmode = imgmodevalWFS.md->size[0];
}
mstatstruct.NBmode = NBmode;
Expand All @@ -285,62 +286,69 @@ errno_t AOloopControl_modalstatsTUI(
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_modevalDM", loopindex);
imgmodevalDM = imgid_make_from_name(name);
resolveIMGID(&imgmodevalDM, ERRMODE_ABORT,
resolveIMGID(&imgmodevalDM, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmodevalDM.ID == -1) return RETURN_FAILURE;
}

IMGID imgmodevalDMf;
{
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_modevalDMf", loopindex);
imgmodevalDMf = imgid_make_from_name(name);
resolveIMGID(&imgmodevalDMf, ERRMODE_ABORT,
resolveIMGID(&imgmodevalDMf, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmodevalDMf.ID == -1) return RETURN_FAILURE;
}

IMGID imgmodevalOL;
{
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_modevalOL", loopindex);
imgmodevalOL = imgid_make_from_name(name);
resolveIMGID(&imgmodevalOL, ERRMODE_ABORT,
resolveIMGID(&imgmodevalOL, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmodevalOL.ID == -1) return RETURN_FAILURE;
}

IMGID imgmgain;
{
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_mgain", loopindex);
imgmgain = imgid_make_from_name(name);
resolveIMGID(&imgmgain, ERRMODE_ABORT,
resolveIMGID(&imgmgain, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmgain.ID == -1) return RETURN_FAILURE;
}

IMGID imgmmult;
{
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_mmult", loopindex);
imgmmult = imgid_make_from_name(name);
resolveIMGID(&imgmmult, ERRMODE_ABORT,
resolveIMGID(&imgmmult, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmmult.ID == -1) return RETURN_FAILURE;
}

IMGID imgmlimit;
{
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_mlimit", loopindex);
imgmlimit = imgid_make_from_name(name);
resolveIMGID(&imgmlimit, ERRMODE_ABORT,
resolveIMGID(&imgmlimit, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmlimit.ID == -1) return RETURN_FAILURE;
}

IMGID imgmlimitcntfrac;
{
char name[STRINGMAXLEN_STREAMNAME];
WRITE_IMAGENAME(name, "aol%d_mlimitcntfrac", loopindex);
imgmlimitcntfrac = imgid_make_from_name(name);
resolveIMGID(&imgmlimitcntfrac, ERRMODE_ABORT,
resolveIMGID(&imgmlimitcntfrac, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imgmlimitcntfrac.ID == -1) return RETURN_FAILURE;
}

/* ---- stat accumulation streams ---- */
Expand Down
3 changes: 2 additions & 1 deletion AOloopControl/zonalfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,9 @@ static errno_t compute_function()
{
IMGID imginDM =
imgid_make_from_name(inzval);
resolveIMGID(&imginDM, ERRMODE_ABORT,
resolveIMGID(&imginDM, ERRMODE_WARN,
data.core.image, data.core.NB_MAX_IMAGE);
if (imginDM.ID == -1) return RETURN_FAILURE;

uint32_t dmxsize = imginDM.md->size[0];
uint32_t dmysize = imginDM.md->size[1];
Expand Down
6 changes: 4 additions & 2 deletions AOloopControl_DM/AOloopControl_DM_comb.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,10 @@ static errno_t DMdisp_add_disp_from_circular_buffer(DMCOMB_STATE *state)
data.core.NB_MAX_IMAGE);
state->ag_imgdispbuffer = imgid_make_from_name(astrogridsname);
resolveIMGID(&state->ag_imgdispbuffer,
ERRMODE_ABORT,
ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (state->ag_imgdispbuffer.ID == -1) return RETURN_FAILURE;
state->ag_xysize = (uint64_t)(DMxsize) * (DMysize);
state->ag_sliceindex = 0;
state->ag_framecnt = 0;
Expand Down Expand Up @@ -579,9 +580,10 @@ static DMCOMB_STATE* dmcomb_init()
data.core.NB_MAX_IMAGE);
state->imgdmvolt = imgid_make_from_name(voltname);
resolveIMGID(&state->imgdmvolt,
ERRMODE_ABORT,
ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (state->imgdmvolt.ID == -1) return NULL;
}

if (UNLIKELY(data.core.Debug > 0)) {
Expand Down
6 changes: 4 additions & 2 deletions AOloopControl_DM/DMturbulence.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,10 @@ static errno_t make_seed_turbulence_screen(
{
IMGID imgtmpamp = imgid_make_from_name("tmpamp");
resolveIMGID(
&imgtmpamp, ERRMODE_ABORT,
&imgtmpamp, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgtmpamp.ID == -1) return RETURN_FAILURE;
uint32_t cx = (uint32_t)(size / 2);
uint32_t cy = (uint32_t)(size / 2);
uint32_t w = imgtmpamp.md->size[0];
Expand Down Expand Up @@ -365,9 +366,10 @@ static DMTURB_STATE* dmturb_init() {
// Connect to DM stream
state->imgDM = imgid_make_from_name(dmstream);
resolveIMGID(&state->imgDM,
ERRMODE_ABORT,
ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (state->imgDM.ID == -1) return NULL;
printf("%u x %u actuator\n", state->imgDM.md->size[0], state->imgDM.md->size[1]);

uint32_t xsize = state->imgDM.md->size[0];
Expand Down
6 changes: 4 additions & 2 deletions AOloopControl_DM/pokerndmodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,17 @@ static errno_t compute_function()

IMGID outimg = imgid_make_from_name(outsname);
resolveIMGID(
&outimg, ERRMODE_ABORT,
&outimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (outimg.ID == -1) return RETURN_FAILURE;

IMGID modecimg = imgid_make_from_name(modecsname);
resolveIMGID(
&modecimg, ERRMODE_ABORT,
&modecimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (modecimg.ID == -1) return RETURN_FAILURE;

printf(" COMPUTE Flags = %ld\n", CLIcmddata.cmdsettings->flags);
INSERT_STD_PROCINFO_COMPUTEFUNC_INIT
Expand Down
3 changes: 2 additions & 1 deletion AOloopControl_IOtools/WFScamsim.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,10 @@ static errno_t compute_function()

IMGID wfssignalimg = imgid_make_from_name(wfssignal_in);
resolveIMGID(
&wfssignalimg, ERRMODE_ABORT,
&wfssignalimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (wfssignalimg.ID == -1) return RETURN_FAILURE;

uint32_t sizexWFS = wfssignalimg.md->size[0];
uint32_t sizeyWFS = wfssignalimg.md->size[1];
Expand Down
6 changes: 4 additions & 2 deletions AOloopControl_IOtools/WFSmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,15 +240,17 @@ static errno_t compute_function()

IMGID wfsinimg = imgid_make_from_name(wfsinsname);
resolveIMGID(
&wfsinimg, ERRMODE_ABORT,
&wfsinimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (wfsinimg.ID == -1) return RETURN_FAILURE;

IMGID mapimg = imgid_make_from_name(mapsname);
resolveIMGID(
&mapimg, ERRMODE_ABORT,
&mapimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (mapimg.ID == -1) return RETURN_FAILURE;


uint32_t sizeout = mapimg.md->size[2];
Expand Down
6 changes: 4 additions & 2 deletions AOloopControl_IOtools/acquireWFSspec.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,10 @@ static errno_t compute_function()

IMGID wfsin = imgid_make_from_name(input_shm_name); // input raw wfs image
resolveIMGID(
&wfsin, ERRMODE_ABORT,
&wfsin, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (wfsin.ID == -1) return RETURN_FAILURE;

uint32_t sizeWFSx = wfsin.md->size[0];
uint32_t sizeWFSy = wfsin.md->size[1];
Expand All @@ -277,9 +278,10 @@ static errno_t compute_function()

IMGID specmask = imgid_make_from_name(specmask_shm_name);
resolveIMGID(
&specmask, ERRMODE_ABORT,
&specmask, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (specmask.ID == -1) return RETURN_FAILURE;
uint32_t numtraces = specmask.md->size[2];
uint64_t sizeWFS = sizeWFSx * numtraces;
uint32_t sizeWFSoutx = sizeWFSx / binning;
Expand Down
3 changes: 2 additions & 1 deletion AOloopControl_IOtools/ao188_preprocessor.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,10 @@ static errno_t compute_function()
// Since it's a fps PARAM_IMG, it's expected to be already loaded.
IMGID apd_mat_in = imgid_make_from_name(apd_mat_name);
resolveIMGID(
&apd_mat_in, ERRMODE_ABORT,
&apd_mat_in, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (apd_mat_in.ID == -1) return RETURN_FAILURE;

float apd_integrator[NUM_APD_HOWFS];
memset(apd_integrator, 0, NUM_APD_HOWFS * sizeof(float));
Expand Down
3 changes: 2 additions & 1 deletion AOloopControl_IOtools/findspots.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,10 @@ static errno_t compute_function()

IMGID inimg = imgid_make_from_name(inimname);
resolveIMGID(
&inimg, ERRMODE_ABORT,
&inimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (inimg.ID == -1) return RETURN_FAILURE;

INSERT_STD_PROCINFO_COMPUTEFUNC_INIT

Expand Down
12 changes: 8 additions & 4 deletions AOloopControl_IOtools/spotpos.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ static errno_t spot_position(
// custom stream process function code

// check input image exists
resolveIMGID(inimg, ERRMODE_ABORT, data.core.image, data.core.NB_MAX_IMAGE);
resolveIMGID(inimg, ERRMODE_WARN, data.core.image, data.core.NB_MAX_IMAGE);
if (inimg->ID == -1) return RETURN_FAILURE;

// get image size
uint32_t xsize = inimg->md->size[0];
Expand All @@ -198,13 +199,15 @@ static errno_t spot_position(
// Checko output
//
resolveIMGID(
outdatimg, ERRMODE_ABORT,
outdatimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (outdatimg->ID == -1) return RETURN_FAILURE;
resolveIMGID(
outvecimg, ERRMODE_ABORT,
outvecimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (outvecimg->ID == -1) return RETURN_FAILURE;


float xstart = spot_x0 - spot_searchrad;
Expand Down Expand Up @@ -299,9 +302,10 @@ static errno_t compute_function()
// resolve image and create IMGID
IMGID inimg = imgid_make_from_name(inimname);
resolveIMGID(
&inimg, ERRMODE_ABORT,
&inimg, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (inimg.ID == -1) return RETURN_FAILURE;

// resolve dark image and create IMGID (optional)
IMGID indarkimg = imgid_make_from_name(indarkname);
Expand Down
9 changes: 6 additions & 3 deletions AOloopControl_acquireCalib/measure_linear_resp.c
Original file line number Diff line number Diff line change
Expand Up @@ -870,25 +870,28 @@ static errno_t compute_function()
// connect to input space
IMGID imgin = imgid_make_from_name(streamin);
resolveIMGID(
&imgin, ERRMODE_ABORT,
&imgin, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgin.ID == -1) return RETURN_FAILURE;
printf("input space size : %u %u\n", imgin.md->size[0], imgin.md->size[1]);

// connect to output space
IMGID imgout = imgid_make_from_name(streamout);
resolveIMGID(
&imgout, ERRMODE_ABORT,
&imgout, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imgout.ID == -1) return RETURN_FAILURE;
printf("output space size : %u %u\n", imgout.md->size[0], imgout.md->size[1]);

load_fits(inmodeC, "inmodeC", LOADFITS_ERRMODE_WARNING, NULL);
IMGID imginmodeC = imgid_make_from_name("inmodeC");
resolveIMGID(
&imginmodeC, ERRMODE_ABORT,
&imginmodeC, ERRMODE_WARN,
data.core.image,
data.core.NB_MAX_IMAGE);
if (imginmodeC.ID == -1) return RETURN_FAILURE;
printf("input modes size : %u %u %u\n", imginmodeC.md->size[0],
imginmodeC.md->size[1], imginmodeC.md->size[2]);

Expand Down
Loading
Loading