Merge pull request #2148 from willend/main

willend · web-flow · commit b24a1e0dbc24 · 2025-10-27T16:02:27.000+01:00
Safety valve for search with filter (returned bad list in search mcdoc powder)
diff --git a/mcstas-comps/examples/Risoe/TAS1_C1/TAS1_C1.instr b/mcstas-comps/examples/Risoe/TAS1_C1/TAS1_C1.instr
@@ -13,6 +13,8 @@
 * Origin: Risoe
 * %INSTRUMENT_SITE: Risoe
 *
+* Example formerly known as linup-1.instr
+*
 * The conventional cold-source triple-axis spectrometer TAS1 at Risoe National
 * Laboratory used as a diffractometer for monochromator rocking curves
 *
diff --git a/mcstas-comps/examples/Risoe/TAS1_C1_Tilt/TAS1_C1_Tilt.instr b/mcstas-comps/examples/Risoe/TAS1_C1_Tilt/TAS1_C1_Tilt.instr
@@ -13,6 +13,8 @@
 * Origin: Risoe
 * %INSTRUMENT_SITE: Risoe
 *
+* Example formerly known as linup-2.instr
+*
 * The conventional cold-source triple-axis spectrometer TAS1 at Risoe National
 * Laboratory used as a diffractometer for a collimator tilt alignment.
 *
diff --git a/mcstas-comps/examples/Risoe/TAS1_Diff_Powder/TAS1_Diff_Powder.instr b/mcstas-comps/examples/Risoe/TAS1_Diff_Powder/TAS1_Diff_Powder.instr
@@ -13,6 +13,8 @@
 * Origin: Risoe
 * %INSTRUMENT_SITE: Risoe
 *
+* Example formerly known as linup-5.instr
+*
 * The conventional cold-source triple-axis spectrometer TAS1 at Risoe National
 * Laboratory used as a diffractometer for an alignment study with a
 * powder sample.
diff --git a/mcstas-comps/examples/Risoe/TAS1_Diff_Slit/TAS1_Diff_Slit.instr b/mcstas-comps/examples/Risoe/TAS1_Diff_Slit/TAS1_Diff_Slit.instr
@@ -13,6 +13,8 @@
 * Origin: Risoe
 * %INSTRUMENT_SITE: Risoe
 *
+* Example formerly known as linup-3.instr
+*
 * The conventional cold-source triple-axis spectrometer TAS1 at Risoe National
 * Laboratory used as a diffractometer for a collimation alignment study with a
 * slit sample.
diff --git a/mcstas-comps/examples/Risoe/TAS1_Diff_Vana/TAS1_Diff_Vana.instr b/mcstas-comps/examples/Risoe/TAS1_Diff_Vana/TAS1_Diff_Vana.instr
@@ -13,6 +13,8 @@
 * Origin: Risoe
 * %INSTRUMENT_SITE: Risoe
 *
+* Example formerly known as linup-4.instr
+*
 * The conventional cold-source triple-axis spectrometer TAS1 at Risoe National
 * Laboratory used as a diffractometer for an alignment study with a
 * vanadium sample.
diff --git a/mcstas-comps/examples/Risoe/TAS1_Powder/TAS1_Powder.instr b/mcstas-comps/examples/Risoe/TAS1_Powder/TAS1_Powder.instr
@@ -13,6 +13,8 @@
 * Origin: Risoe
 * %INSTRUMENT_SITE: Risoe
 *
+* Example formerly known as linup-7.instr
+*
 * The conventional cold-source triple-axis spectrometer TAS1 at Risoe National
 * Laboratory used with a powder sample.
 *
diff --git a/mcstas-comps/examples/Risoe/TAS1_Vana/TAS1_Vana.instr b/mcstas-comps/examples/Risoe/TAS1_Vana/TAS1_Vana.instr
@@ -13,6 +13,8 @@
 * Origin: Risoe
 * %INSTRUMENT_SITE: Risoe
 *
+* Example formerly known as linup-6.instr
+*
 * The conventional cold-source triple-axis spectrometer TAS1 at Risoe National
 * Laboratory used with a vanadium sample.
 *
diff --git a/mcstas-comps/examples/SINE2020/McStas_PowderN/McStas_PowderN.instr b/mcstas-comps/examples/SINE2020/McStas_PowderN/McStas_PowderN.instr
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Instrument: McStas_PowdeN
+* Instrument: McStas_PowderN
 *
 * %I
 * Written by: Peter Willendrup
diff --git a/mcstas-comps/examples/Union_validation/Powder_validation/Powder_validation.instr b/mcstas-comps/examples/Union_validation/Powder_validation/Powder_validation.instr
@@ -5,7 +5,7 @@
 *         Risoe National Laboratory, Roskilde, Denmark
 *         Institut Laue Langevin, Grenoble, France
 *
-* Instrument: incoherent_validation
+* Instrument: Powder_validation
 *
 * %Identification
 * Written by: Mads Bertelsen
diff --git a/tools/Python/mcdoc/mcdoc.py b/tools/Python/mcdoc/mcdoc.py
@@ -923,27 +923,41 @@ def parse_and_filter(indir, namefilter=None, recursive=False, printlog=False):
 def write_doc_files_or_continue(comp_infos, instr_infos, comp_files, instr_files, printlog=False):
     ''' Writes component and instrument docs files '''
     for i in range(len(comp_infos)):
-        p = comp_infos[i]
-        f = comp_files[i]
-        doc = CompDocWriter(p)
-        text = doc.create()
-        h = pathlib.Path(os.path.splitext(f)[0] + '.html')
-        h = pathlib.Path(str(h).replace(mccode_config.directories['resourcedir'], mccode_config.directories['docdir']))
-        if printlog:
-            print("writing doc file... %s" % h)
-        write_file(h, text, failsilent=True)
+        try:
+            p = comp_infos[i]
+            try:
+                f = comp_files[i]
+            except:
+                f = comp_infos[i].filepath
+            doc = CompDocWriter(p)
+            text = doc.create()
+            h = pathlib.Path(os.path.splitext(f)[0] + '.html')
+            h = pathlib.Path(str(h).replace(mccode_config.directories['resourcedir'], mccode_config.directories['docdir']))
+            if printlog:
+                print("writing doc file... %s" % h)
+            write_file(h, text, failsilent=True)
+        except:
+            print("Could not work on comp " + str(i) + " of " + str(len(comp_infos)) + ": " + comp_infos[i].name)
+            pass
 
     for i in range(len(instr_infos)):
-        p = instr_infos[i]
-        f = instr_files[i]
-        doc = InstrDocWriter(p)
-        text = doc.create()
-        h = pathlib.Path(os.path.splitext(f)[0] + '.html')
-        h = pathlib.Path(str(h).replace(mccode_config.directories['resourcedir'], mccode_config.directories['docdir']))
-        if printlog:
-            print("writing doc file... %s" % h)
-        write_file(h, text, failsilent=True)
-
+        try:
+            p = instr_infos[i]
+            try:
+                f = instr_infos[i].filepath
+            except:
+                f = instr_files[i]
+            doc = InstrDocWriter(p)
+            text = doc.create()
+            h = pathlib.Path(os.path.splitext(f)[0] + '.html')
+            h = pathlib.Path(str(h).replace(mccode_config.directories['resourcedir'], mccode_config.directories['docdir']))
+            if printlog:
+                print("writing doc file... %s" % h)
+            write_file(h, text, failsilent=True)
+        except:
+            print("Could not work on instr " + str(i) + " of " + str(len(instr_infos)) + ": " + instr_infos[i].name)
+            print(instr_infos[i].filepath)
+            pass
 
 def main(args):
     logging.basicConfig(level=logging.INFO)

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`* Origin: Risoe`
`14`	`14`	`* %INSTRUMENT_SITE: Risoe`
`15`	`15`	`*`
	`16`	`+* Example formerly known as linup-1.instr`
	`17`	`+*`
`16`	`18`	`* The conventional cold-source triple-axis spectrometer TAS1 at Risoe National`
`17`	`19`	`* Laboratory used as a diffractometer for monochromator rocking curves`
`18`	`20`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*******************************************************************************`
`2`		`-* Instrument: McStas_PowdeN`
	`2`	`+* Instrument: McStas_PowderN`
`3`	`3`	`*`
`4`	`4`	`* %I`
`5`	`5`	`* Written by: Peter Willendrup`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Risoe National Laboratory, Roskilde, Denmark`
`6`	`6`	`* Institut Laue Langevin, Grenoble, France`
`7`	`7`	`*`
`8`		`-* Instrument: incoherent_validation`
	`8`	`+* Instrument: Powder_validation`
`9`	`9`	`*`
`10`	`10`	`* %Identification`
`11`	`11`	`* Written by: Mads Bertelsen`