Transition McXtrace to union-lib

willend · willend · commit e111ec5913c3 · 2026-01-21T15:01:33.000+01:00
diff --git a/mcxtrace-comps/share/Geometry_functions.c b/mcxtrace-comps/share/Geometry_functions.c
diff --git a/mcxtrace-comps/share/Union_functions.c b/mcxtrace-comps/share/Union_functions.c
diff --git a/mcxtrace-comps/share/union-init.c b/mcxtrace-comps/share/union-init.c
diff --git a/mcxtrace-comps/share/union-lib.c b/mcxtrace-comps/share/union-lib.c
diff --git a/mcxtrace-comps/share/union-suffix.c b/mcxtrace-comps/share/union-suffix.c
diff --git a/mcxtrace-comps/union/Compton_xrl_process.comp b/mcxtrace-comps/union/Compton_xrl_process.comp
@@ -58,8 +58,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Incoherent_process.comp b/mcxtrace-comps/union/Incoherent_process.comp
@@ -63,8 +63,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/KN_xrl_process.comp b/mcxtrace-comps/union/KN_xrl_process.comp
@@ -58,8 +58,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Powder_process.comp b/mcxtrace-comps/union/Powder_process.comp
@@ -68,8 +68,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Rayleigh_xrl_process.comp b/mcxtrace-comps/union/Rayleigh_xrl_process.comp
@@ -58,8 +58,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Template_process.comp b/mcxtrace-comps/union/Template_process.comp
@@ -61,7 +61,7 @@ SHARE
 #define Union $Revision: 0.8 $
 
 #include "Union_functions.c"
-#include "Union_initialization.c"
+#include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_box.comp b/mcxtrace-comps/union/Union_box.comp
@@ -77,8 +77,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_cone.comp b/mcxtrace-comps/union/Union_cone.comp
@@ -75,8 +75,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_cylinder.comp b/mcxtrace-comps/union/Union_cylinder.comp
@@ -73,8 +73,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_init.comp b/mcxtrace-comps/union/Union_init.comp
@@ -63,7 +63,7 @@ exit(1);
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
+%include "union-lib.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_make_material.comp b/mcxtrace-comps/union/Union_make_material.comp
@@ -61,8 +61,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_master.comp b/mcxtrace-comps/union/Union_master.comp
@@ -73,8 +73,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.9 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_sphere.comp b/mcxtrace-comps/union/Union_sphere.comp
@@ -69,8 +69,8 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
diff --git a/mcxtrace-comps/union/Union_stop.comp b/mcxtrace-comps/union/Union_stop.comp
@@ -52,12 +52,12 @@ SHARE
 #ifndef Union
 #define Union $Revision: 0.8 $
 
-%include "Union_functions.c"
-%include "Union_initialization.c"
+
+%include "union-init.c"
 
 #endif
 
-%include "Union_last_functions.c"
+%include "union-suffix.c"
 %}
 
 DECLARE
