adjusting template

Author: maureeungaro

LICENSE

@@ -0,0 +1,193 @@
+# GEMC Software License
+
+*Version 1.0, August 25, 2025*
+
+> [!WARNING]
+> Copyright (c) 2006–2025,
+> Maurizio Ungaro and Thomas Jefferson National Accelerator Facility (`Jefferson Lab`).
+> <br/>
+> All rights not expressly granted under this license are reserved.
+
+<br/>
+This software includes voluntary contributions made to the GEMC project.
+Additional information about GEMC may be provided in the accompanying
+documentation or repository.
+
+Installation, use, reproduction, display, modification, and redistribution of
+this software, with or without modification, in source and binary forms, are
+permitted on a non-exclusive basis. Any exercise of rights by you under this
+license is subject to the following conditions:
+
+<br/>
+
+-----
+
+<br/>
+
+### 1\. Redistributions
+
+Redistributions of this software, in whole or in part, with or without
+modification, must reproduce the above copyright notice and these license
+conditions in (a) the source code, (b) the user documentation, and (c) any
+other materials provided with the redistributed software.
+
+<br/>
+
+-----
+
+<br/>
+
+### 2\. User Documentation
+
+The user documentation, if any, included with a redistribution, must
+include the following notice:
+
+```
+This product includes the GEMC software developed by Maurizio Ungaro
+at Thomas Jefferson National Accelerator Facility (Jefferson Lab).
+```
+
+If that is where third-party acknowledgments normally appear, this
+acknowledgment must also be reproduced in any modified version of this
+software itself.
+
+<br/>
+
+-----
+
+<br/>
+
+### 3\. Scientific Citation
+
+Publications or presentations that use this software
+or results produced with it must include the following citation:
+
+```bash
+M. Ungaro, Geant4 Monte-Carlo (GEMC): A database-driven simulation program, 
+EPJ Web of Conferences 295, 05005 (2024),
+https://doi.org/10.1051/epjconf/202429505005
+```
+
+```latex
+\bibitem{2024EPJWC.29505005U}
+{Ungaro}, M.: Geant4 Monte-Carlo (GEMC) A database-driven simulation program.
+\newblock European Physical Journal Web of Conferences \textbf{295}, 05005 (2024).
+\newblock \doi{10.1051/epjconf/202429505005}
+```
+
+```bibtex 
+@INPROCEEDINGS{2024EPJWC.29505005U,
+       author = { {Ungaro}, Maurizio,
+        title = "{Geant4 Monte-Carlo (GEMC) A database-driven simulation program}",
+    booktitle = {European Physical Journal Web of Conferences},
+         year = 2024,
+       series = {European Physical Journal Web of Conferences},
+       volume = {295},
+        month = may,
+          eid = {05005},
+        pages = {05005},
+          doi = {10.1051/epjconf/202429505005},
+       adsurl = {https://ui.adsabs.harvard.edu/abs/2024EPJWC.29505005U},
+      adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
+```
+
+<br/>
+
+-----
+
+<br/>
+
+### 4\. Names and Endorsement
+
+The names `GEMC` and `GEMC: Geant4 Monte-Carlo` may not be used to endorse or promote
+software or products derived from this software except with prior written permission
+from the copyright holders. For permissions, contact: [gemc@jlab.org](mailto: gemc@jlab.org).
+If this software is redistributed in a modified form, the name and reference of the modified
+version must be clearly distinguishable from that of this software.
+
+<br/>
+
+-----
+
+<br/>
+
+### 5\. Modifications
+
+You are under no obligation to provide anyone with any modifications of this software
+that you may develop, including but not limited to bug fixes, patches, upgrades, or other
+enhancements or derivatives of features, functionality, or performance.
+However, if you publish or distribute your modifications without contemporaneously
+requiring users to enter into a separate written license agreement, then you are deemed to
+have granted Maurizio Ungaro, Jefferson Lab, and all contributors to GEMC a license to your
+modifications, including modifications protected by any patent owned or controlled by you,
+under the conditions of this license.
+
+<br/>
+
+-----
+
+<br/>
+
+### 6\. Patents
+
+You may not include this software, in whole or in part, in any patent o
+r patent application in respect of any modification of this software developed
+by you.
+
+<br/>
+
+-----
+
+<br/>
+
+### 7\. Third-Party Software
+
+This software may be distributed with or may require third-party components (including,
+without limitation, Geant4, CLHEP, Qt, ROOT, SQLite, Assimp, and others) that are separately
+licensed. Such components are provided under their respective licenses, and you must comply
+with those licenses in addition to this one. Where required (for example, by the Geant4
+license), you must reproduce the applicable notices and acknowledgments in your redistribution.
+
+<br/>
+
+-----
+
+<br/>
+
+### 8\. DISCLAIMER
+
+**THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
+MERCHANTABILITY, SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE OR USE
+ARE DISCLAIMED. THE COPYRIGHT HOLDERS AND CONTRIBUTORS MAKE NO REPRESENTATION THAT
+THE SOFTWARE, OR MODIFICATIONS THEREOF, WILL NOT INFRINGE ANY PATENT, COPYRIGHT,
+TRADE SECRET, OR OTHER PROPRIETARY RIGHT.**
+
+<br/>
+
+-----
+
+<br/>
+
+### 9\. LIMITATION OF LIABILITY
+
+**IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE DAMAGES OF ANY
+CHARACTER INCLUDING, WITHOUT LIMITATION, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES,
+LOSS OF USE, DATA, OR PROFITS, OR BUSINESS INTERRUPTION, HOWEVER CAUSED AND ON ANY THEORY
+OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), PRODUCT LIABILITY, OR OTHERWISE,
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.**
+
+<br/>
+
+-----
+
+<br/>
+
+### 10\. Termination
+
+This license shall terminate with immediate effect and without notice if you fail
+to comply with any of its terms, or if you institute litigation against any copyright
+holder or contributor with regard to this software.

LICENSE.md

@@ -125,12 +125,12 @@ def write_templates(system, variations):
 		print(f'    * {v}')
 	print()
 
-	# create directory if not existing
+	# create the directory if not existing
 	if not os.path.exists(system):
 		os.makedirs(system)
 
 	system_script = system + '/' + system + '.py'
-	geo_script = system + '/geometry_' + system + '.py'
+	geo_script = system + '/geometry.py'
 	mat_script = system + '/materials.py'
 	yaml = system + '/' + system + '.yaml'
 	readme = system + '/README.md'
@@ -143,12 +143,12 @@ def write_templates(system, variations):
 		ps.write('from utils_api import GConfiguration\n\n')
 		ps.write(f'# {system}:\n')
 		ps.write('from materials import define_materials\n')
-		ps.write(f'from geometry import build_geometry\n\n')
+		ps.write(f'from geometry import build_{system}\n\n')
 		ps.write('def main():\n')
 		ps.write('	# Define GConfiguration name, factory and description.\n')
 		ps.write(f'	configuration = GConfiguration(\'{experiment}\', \'{system}\')\n\n')
 		ps.write('	define_materials(configuration)\n')
-		ps.write(f'	build_geometry(configuration)\n')
+		ps.write(f'	build_{system}(configuration)\n')
 		ps.write('	configuration.printC()\n\n\n')
 		ps.write('if __name__ == "__main__":\n')
 		ps.write('	main()\n\n\n')
@@ -187,54 +187,46 @@ def write_templates(system, variations):
 		pg.write('def build_mother_volume(configuration):\n')
 		pg.write('	gvolume = GVolume(\'absorber\')\n')
 		pg.write('	gvolume.description = \'scintillator box\'\n')
-		pg.write('	gvolume.make_box(100.0, 100.0, 100.0)\n')
+		pg.write('	gvolume.make_box(100.0, 100.0, 1.0)\n')
 		pg.write('	gvolume.material    = \'carbonFiber\'\n')
 		pg.write('	gvolume.color       = \'3399FF\'\n')
 		pg.write('	gvolume.digitization = \'flux\'\n')
+		pg.write('	gvolume.set_position(0, 0, 100)\n')
+		pg.write('	gvolume.style       = 1\n')
 		pg.write('	gvolume.set_identifier(\'box\', 2)  # identifier for this box\n')
-
-		pg.write('	gvolume.style       = 0\n')
 		pg.write('	gvolume.publish(configuration)\n\n')
+
 		pg.write('def build_target(configuration):\n')
 		pg.write('	gvolume = GVolume(\'target\')\n')
 		pg.write('	gvolume.description = \'epoxy target\'\n')
-		pg.write('	gvolume.mother    = \'absorber\'\n')
 		pg.write('	gvolume.make_tube(0, 20, 40, 0, 360)\n')
 		pg.write('	gvolume.material    = \'epoxy\'\n')
-		pg.write('	gvolume.color       = \'ff0000\'\n')
 		pg.write('	gvolume.publish(configuration)\n\n\n\n')
 
-	geo_main = system + '/geometry.py'
-	# ask_to_overwrite_file(geo_main)
-	with open(f'{geo_main}', 'w') as pg:
-		pg.write(f'from geometry_{system} import build_{system}\n\n')
-		pg.write(f'def build_geometry(configuration):\n')
-		pg.write(f'  build_{system}(configuration)\n')
 
 	# ask_to_overwrite_file(yaml)
 	with open(f'{yaml}', 'w') as pj:
 		pj.write('runno: 1\n')
 		pj.write('n: 10\n\n')
 		pj.write('gparticle:\n')
-		pj.write('  - name: e-\n')
+		pj.write('  - name: proton\n')
 		pj.write('    p: 1500\n')
-		pj.write('    theta: 23.0\n')
+		pj.write('    theta: 10.0\n')
 		pj.write('    delta_theta: 4.0\n')
-		pj.write('    delta_phi: 18.0\n')
-		pj.write('    multiplicity: 4\n\n')
-		pj.write('  - name: proton\n')
-		pj.write('    p: 3000\n\n')
+		pj.write('    delta_phi: 180.0\n')
+		pj.write('    vz: -100.0\n')
 		pj.write('verbosity:\n')
-		pj.write('  - ghits: 2\n')
-		pj.write('  - gsystem: 2\n')
-		pj.write('  - gstreamer: 2\n')
-		pj.write('  - general: 2\n\n')
+		pj.write('  - ghits: 0\n')
+		pj.write('  - gsystem: 1\n')
+		pj.write('  - gstreamer: 0\n')
+		pj.write('  - general: 1\n\n')
 		pj.write('gsystem:\n')
 		pj.write(f'  - name: {system}\n')
-		pj.write('    factory: ascii\n\n')
+		pj.write('    factory: sqlite\n\n')
 		pj.write('gstreamer:\n')
 		pj.write(f'  - filename: {system}.txt\n')
 		pj.write('    format: ascii\n\n')
+		pj.write('root: G4Box, 15*cm, 15*cm, 15*cm, G4_AIR\n')
 
 	# ask_to_overwrite_file(readme)
 	with open(f'{readme}', 'w') as rm:

api/system_template.py

@@ -19,6 +19,6 @@ bool GstreamerTextFactory::closeConnectionImpl() {
 
 	if (ofile->is_open()) { log->error(ERR_CANTCLOSEOUTPUT, "GstreamerTextFactory: could not close file " + filename()); }
 
-	delete ofile;
+///	delete ofile;
 	return true;
 }