Skip to content
Snippets Groups Projects
Commit fd78f5dd authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Enforce repetition of first scale operations when SPHERE updates the order

parent 61ed4675
Branches
No related tags found
No related merge requests found
...@@ -597,7 +597,7 @@ int sphere_jxi488_cycle( ...@@ -597,7 +597,7 @@ int sphere_jxi488_cycle(
logger->log(message, LOG_INFO); logger->log(message, LOG_INFO);
sid->update_order(new_lm); sid->update_order(new_lm);
is_first_scale = true; is_first_scale = true;
jw = 1; // jw = 1;
l_max = new_lm; l_max = new_lm;
} }
} }
...@@ -744,7 +744,7 @@ int sphere_jxi488_cycle( ...@@ -744,7 +744,7 @@ int sphere_jxi488_cycle(
double ph = sa->ph; double ph = sa->ph;
for (int jph484 = 0; jph484 < sa->nph; jph484++) { for (int jph484 = 0; jph484 < sa->nph; jph484++) {
int jph = jph484 + 1; int jph = jph484 + 1;
bool goto182 = (sa->nk == 1) && (jxi > 1); bool goto182 = (sa->nk == 1) && (!is_first_scale);
if (!goto182) { if (!goto182) {
upvmp(th, ph, 0, sid->cost, sid->sint, sid->cosp, sid->sinp, sid->u, sid->upmp, sid->unmp); upvmp(th, ph, 0, sid->cost, sid->sint, sid->cosp, sid->sinp, sid->u, sid->upmp, sid->unmp);
} }
...@@ -779,7 +779,7 @@ int sphere_jxi488_cycle( ...@@ -779,7 +779,7 @@ int sphere_jxi488_cycle(
phs = ph + phsph; phs = ph + phsph;
if (phs >= 360.0) phs -= 360.0; if (phs >= 360.0) phs -= 360.0;
} }
bool goto190 = (nks == 1) && ((jxi > 1) || (jth > 1) || (jph > 1)); bool goto190 = (nks == 1) && ((!is_first_scale) || (jth > 1) || (jph > 1));
if (!goto190) { if (!goto190) {
upvmp(ths, phs, icspnv, sid->costs, sid->sints, sid->cosps, sid->sinps, sid->us, sid->upsmp, sid->unsmp); upvmp(ths, phs, icspnv, sid->costs, sid->sints, sid->cosps, sid->sinps, sid->us, sid->upsmp, sid->unsmp);
if (gconf->isam >= 0) { if (gconf->isam >= 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment