Commit 0c30e7a0 authored by Éric Thiébaut's avatar Éric Thiébaut
Browse files

Normalize API names for deformable mirrors

parent e6793c43
......@@ -194,7 +194,7 @@ uint8_t* alpao_mirror_mask_create_by_name(
dims[0] = dim;
dims[1] = dim;
}
return tao_create_mirror_mask(dim, dim, nacts);
return tao_mirror_mask_create(dim, dim, nacts);
}
}
}
......@@ -226,7 +226,7 @@ uint8_t* alpao_mirror_mask_create_by_nacts(
dims[0] = dim;
dims[1] = dim;
}
return tao_create_mirror_mask(dim, dim, nacts);
return tao_mirror_mask_create(dim, dim, nacts);
}
// OPERATIONS ON MIRROR INSTANCES ---------------------------------------------
......
......@@ -232,7 +232,7 @@ int main(
progname, dims[0], dims[1]);
return EXIT_FAILURE;
}
nacts = tao_build_indexed_layout(inds, msk, dims[0], dims[1], orient);
nacts = tao_indexed_layout_build(inds, msk, dims[0], dims[1], orient);
if (nacts < 1) {
fprintf(stderr, "%s: failed to build layout indices\n", progname);
tao_report_error();
......
......@@ -602,7 +602,7 @@ tao_status tao_remote_mirror_run_loop(
#define MSK(i1,i2) msk[(i1) + dim1*(i2)]
#define INDS(j1,j2) inds[(j1) + dim1*(j2)]
long tao_build_indexed_layout(
long tao_indexed_layout_build(
long* inds,
const uint8_t* msk,
long dim1,
......@@ -669,7 +669,7 @@ long tao_build_indexed_layout(
#undef MSK
#undef INDS
uint8_t* tao_create_mirror_mask(
uint8_t* tao_mirror_mask_create(
long dim1,
long dim2,
long nacts)
......@@ -683,10 +683,10 @@ uint8_t* tao_create_mirror_mask(
if (mask == NULL) {
return NULL;
}
return tao_instanciate_mirror_mask(mask, dim1, dim2, nacts, NULL);
return tao_mirror_mask_instanciate(mask, dim1, dim2, nacts, NULL);
}
uint8_t* tao_instanciate_mirror_mask(
uint8_t* tao_mirror_mask_instanciate(
uint8_t* mask,
long dim1,
long dim2,
......@@ -766,7 +766,7 @@ uint8_t* tao_instanciate_mirror_mask(
return mask;
}
uint8_t* tao_create_mirror_mask_from_text(
uint8_t* tao_mirror_mask_create_from_text(
char const* shape[],
long nrows,
long dims[2])
......
......@@ -230,12 +230,12 @@ int main(
progname);
return EXIT_FAILURE;
}
if (tao_instanciate_mirror_mask(msk, dim, dim, nacts, inds) == NULL) {
if (tao_mirror_mask_instanciate(msk, dim, dim, nacts, inds) == NULL) {
fprintf(stderr, "%s: failed to instanciate mirror mask\n",
progname);
return EXIT_FAILURE;
}
nacts = tao_build_indexed_layout(inds, msk, dim, dim, orient);
nacts = tao_indexed_layout_build(inds, msk, dim, dim, orient);
if (nacts < 1) {
fprintf(stderr, "%s: failed to build layout indices\n", progname);
tao_report_error();
......
......@@ -919,7 +919,7 @@ extern tao_status tao_remote_mirror_run_loop(
*
* @return The number `n ≥ 0` of valid sites; `-1` in case of errors.
*/
extern long tao_build_indexed_layout(
extern long tao_indexed_layout_build(
long* inds,
const uint8_t* msk,
long dim1,
......@@ -940,7 +940,7 @@ extern long tao_build_indexed_layout(
*
* @return The address of the mask, `NULL` in case of failure.
*/
extern uint8_t* tao_create_mirror_mask(
extern uint8_t* tao_mirror_mask_create(
long dim1,
long dim2,
long nacts);
......@@ -1006,7 +1006,7 @@ extern uint8_t* tao_create_mirror_mask(
*
* @return The address of the mask, `NULL` in case of failure.
*/
extern uint8_t* tao_instanciate_mirror_mask(
extern uint8_t* tao_mirror_mask_instanciate(
uint8_t* mask,
long dim1,
long dim2,
......@@ -1027,7 +1027,7 @@ extern uint8_t* tao_instanciate_mirror_mask(
*
* @return The address of the mask, `NULL` in case of failure.
*/
extern uint8_t* tao_create_mirror_mask(
extern uint8_t* tao_mirror_mask_create(
long dim1,
long dim2,
long nacts);
......@@ -1070,7 +1070,7 @@ extern uint8_t* tao_create_mirror_mask(
*
* @return The address of the mask, `NULL` in case of failure.
*/
extern uint8_t* tao_create_mirror_mask_from_text(
extern uint8_t* tao_mirror_mask_create_from_text(
char const* shape[],
long nrows,
long dims[2]);
......
Supports Markdown
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