From 07b75bfe15958f4b2df5d27981543eb6ea25855b Mon Sep 17 00:00:00 2001 From: Riccardo De Maria Date: Wed, 7 Sep 2022 16:17:57 +0200 Subject: [PATCH 1/3] fix order due to PR install --- tests/test-c6t-4/fc.2.ref | 20 ++++++++++---------- tests/test-c6t-4/fc.3.aper.ref | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/test-c6t-4/fc.2.ref b/tests/test-c6t-4/fc.2.ref index 4fc0add3e..a8bf2e943 100644 --- a/tests/test-c6t-4/fc.2.ref +++ b/tests/test-c6t-4/fc.2.ref @@ -1,7 +1,7 @@ SINGLE ELEMENTS--------------------------------------------------------- -atlaspipe1.r1_AP 0 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 ip1 0 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 ip1_AP 0 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 +atlaspipe1.r1_AP 0 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 drift_0 0 0.000000000000000e+00 0.000000000000000e+00 3.696700000000000e-01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 drift_1 0 0.000000000000000e+00 0.000000000000000e+00 3.696600000000000e-01 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 drift_4 0 0.000000000000000e+00 0.000000000000000e+00 2.133000000000007e-02 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 @@ -1533,7 +1533,7 @@ BLOC488 drift_8425 BLOC489 drift_8426 NEXT STRUCTURE INPUT--------------------------------------------------------- -atlaspipe1.r1_AP ip1 ip1_AP +ip1 ip1_AP atlaspipe1.r1_AP BLOC1 atlaspipe1.r1_AP BLOC2 atlaspipe1.r1_AP BLOC1 atlaspipe1.r1_AP BLOC1 atlaspipe1.r1_AP BLOC3 @@ -2904,8 +2904,8 @@ ip1_AP BLOC151 BLOC151 ip1_AP BLOC152 ip1_AP BLOC151 ip1_AP BLOC151 ip1_AP BLOC152 -ip1_AP BLOC151 ip1_AP -ip2 ip1_AP BLOC157 +ip1_AP BLOC151 ip2 +ip1_AP ip1_AP BLOC157 ip1_AP BLOC157 ip1_AP BLOC157 alicepipe3.r2_AP BLOC157 alicepipe4.r2_AP BLOC157 alicepipe5.r2_AP @@ -6598,8 +6598,8 @@ cmspipe7.l5_AP BLOC1 BLOC2 cmspipe5.l5_AP BLOC1 cmspipe4.l5_AP BLOC1 cmspipe4.l5_AP BLOC2 cmspipe4.l5_AP BLOC1 -cmspipe4.l5_AP cmspipe4.l5_AP ip5 -ip1_AP BLOC1 cmspipe4.l5_AP +ip5 ip1_AP cmspipe4.l5_AP +cmspipe4.l5_AP BLOC1 cmspipe4.l5_AP BLOC2 cmspipe4.l5_AP BLOC1 cmspipe4.l5_AP BLOC1 cmspipe5.l5_AP BLOC2 cmspipe6.l5_AP BLOC1 @@ -10259,8 +10259,8 @@ atlaspipe30.r1_AP BLOC457 BLOC457 atlaspipe30.r1_AP BLOC457 atlaspipe30.r1_AP BLOC457 atlaspipe30.r1_AP BLOC457 atlaspipe30.r1_AP BLOC457 -atlaspipe30.r1_AP BLOC457 atlaspipe30.r1_AP -ip8 ip8_AP BLOC460 +atlaspipe30.r1_AP BLOC457 ip8 +ip8_AP atlaspipe30.r1_AP BLOC460 lhcbpipe1.r8_AP BLOC461 lhcbpipe2.r8_AP BLOC460 lhcbpipe3.r8_AP BLOC460 lhcbpipe4.r8_AP BLOC461 lhcbpipe5.r8_AP @@ -11614,6 +11614,6 @@ BLOC1 atlaspipe1.r1_AP mbas2.1r1 mbas2.1r1_AP BLOC3 atlaspipe1.r1_AP BLOC1 atlaspipe1.r1_AP BLOC1 atlaspipe1.r1_AP BLOC2 -atlaspipe1.r1_AP BLOC1 atlaspipe1.r1_AP -ip1.l1 ip1_AP +atlaspipe1.r1_AP BLOC1 ip1.l1 +ip1_AP atlaspipe1.r1_AP NEXT diff --git a/tests/test-c6t-4/fc.3.aper.ref b/tests/test-c6t-4/fc.3.aper.ref index 5ce1e8622..e4cf5a2e0 100644 --- a/tests/test-c6t-4/fc.3.aper.ref +++ b/tests/test-c6t-4/fc.3.aper.ref @@ -1,5 +1,5 @@ -atlaspipe1.r1_AP CR 23.500 0.000 0.000 0.000 0.000 0.000 0.000 ip1_AP CR 29.000 0.000 0.000 0.000 0.000 0.000 0.000 +atlaspipe1.r1_AP CR 23.500 0.000 0.000 0.000 0.000 0.000 0.000 mbas2.1r1_AP RL 9999.999 9999.999 9999.999 9999.999 0.000 0.000 0.000 atlaspipe11.r1_AP CR 25.060 0.000 0.000 0.000 0.000 0.000 0.000 atlaspipe30.r1_AP CR 40.000 0.000 0.000 0.000 0.000 0.000 0.000 From 6a70006da0845c739ca8d2832461e8a3fab0467e Mon Sep 17 00:00:00 2001 From: Riccardo De Maria Date: Wed, 7 Sep 2022 18:09:14 +0200 Subject: [PATCH 2/3] start disabling inform forcing --- src/mad_node.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mad_node.c b/src/mad_node.c index 068b248b1..59e4a5e73 100644 --- a/src/mad_node.c +++ b/src/mad_node.c @@ -531,7 +531,7 @@ store_node_value(const char* par, double* value) else if (strcmp(lpar, "k0") == 0) { store_comm_par_value("k0",*value,el->def); - el->def->par_names->inform[8] = 1; +// el->def->par_names->inform[8] = 1; } else if (strcmp(lpar, "k1") == 0) store_comm_par_value("k1",*value,el->def); @@ -539,12 +539,12 @@ store_node_value(const char* par, double* value) // The inform is to make sure they are written out to a new sequence. else if (strcmp(lpar, "ktap") == 0) { store_comm_par_value("ktap",*value,el->def); - el->def->par_names->inform[9] = 1; // for quads and sextupoles - el->def->par_names->inform[23] = 1; // for bends +// el->def->par_names->inform[9] = 1; // for quads and sextupoles +// el->def->par_names->inform[23] = 1; // for bends } else if (strcmp(lpar, "lagtap") == 0) { store_comm_par_value("lagtap",*value,el->def); - el->def->par_names->inform[9] = 1; +// el->def->par_names->inform[9] = 1; } else if (strcmp(lpar, "lag") == 0) store_comm_par_value("lag",*value,el->def); From a03e8094185125c49db34cdf54dfe3ca55df225e Mon Sep 17 00:00:00 2001 From: Riccardo De Maria Date: Wed, 7 Sep 2022 18:27:24 +0200 Subject: [PATCH 3/3] example ktap in sequence --- src/mad_seq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mad_seq.c b/src/mad_seq.c index fe9bdcf90..b9c793277 100644 --- a/src/mad_seq.c +++ b/src/mad_seq.c @@ -810,7 +810,11 @@ export_sequence(struct sequence* sequ, FILE* file, int noexpr) strcat(c_dum->c, c_node->from_name); } if(c_node->perm_misalign==1) write_permalign_node(c_node); - + //if(c_node->ktap!=0) { + // strcat(c_dum->c, ", ktap = "); + // sprintf(num, v_format("%F"), c_node->ktap); + // strcat(c_dum->c, supp_tb(num)); + //}; if (exp_par_flag) export_el_def(c_node->p_elem, c_dum->c, noexpr); write_nice(c_dum->c, file); }