Merge pull request #2779 from willend/main

Author: willend

mcstas-comps/misc/MCPL_output.comp

@@ -50,7 +50,7 @@
 
 DEFINE COMPONENT MCPL_output
 
-SETTING PARAMETERS ( string filename=0, int weight_mode=-1, int verbose=0,
+SETTING PARAMETERS ( string filename=0, int weight_mode=1, int verbose=0,
                      int polarisationuse=0, int doubleprec=0,
                      string userflag="",  string userflagcomment="",
                      buffermax=0 )
@@ -150,16 +150,7 @@ INITIALIZE
     mcpl_hdr_add_data (outputfile, "mccode_cmd_line", strlen (clr), clr);
   }
 
-  if (weight_mode == -1) {
-    MPI_MASTER (fprintf (stderr,
-                         "\nWarning (%s): weight_mode unspecified so defaulting to 2"
-                         " (classic mode) which will soon become unavailable and tooling"
-                         " might need updating. Please consult"
-                         " https://github.com/mccode-dev/McCode/discussions/2076 for more"
-                         " information.\n",
-                         NAME_CURRENT_COMP););
-    weight_mode = 2;
-  } else if (weight_mode == 2) {
+  if (weight_mode == 2) {
     MPI_MASTER (fprintf (stderr,
                          "\nWarning (%s): weight_mode=2 selected. This mode will"
                          " soon become unavailable. Please consult"

mcxtrace-comps/misc/MCPL_output.comp

@@ -52,7 +52,7 @@
 
 DEFINE COMPONENT MCPL_output
 
-SETTING PARAMETERS ( string filename=0, int weight_mode=-1, int verbose=0,
+SETTING PARAMETERS ( string filename=0, int weight_mode=1, int verbose=0,
                      int polarisationuse=0, int doubleprec=0,
                      string userflag="",  string userflagcomment="",
                      buffermax=0 )
@@ -153,16 +153,7 @@ INITIALIZE
     mcpl_hdr_add_data (outputfile, "mccode_cmd_line", strlen (clr), clr);
   }
 
-  if (weight_mode == -1) {
-    MPI_MASTER (fprintf (stderr,
-                         "\nWarning (%s): weight_mode unspecified so defaulting to 2"
-                         " (classic mode) which will soon become unavailable and tooling"
-                         " might need updating. Please consult"
-                         " https://github.com/mccode-dev/McCode/discussions/2076 for more"
-                         " information.\n",
-                         NAME_CURRENT_COMP););
-    weight_mode = 2;
-  } else if (weight_mode == 2) {
+  if (weight_mode == 2) {
     MPI_MASTER (fprintf (stderr,
                          "\nWarning (%s): weight_mode=2 selected. This mode will"
                          " soon become unavailable. Please consult"