adding zlib_dep to example executables

Author: maureeungaro

…ub/workflows/dockers_deploy_and_test.yml .github/workflows/deploy.yml.github/workflows/dockers_deploy_and_test.yml renamed to .github/workflows/deploy.yml .github/workflows/dockers_deploy_and_test.yml renamed to .github/workflows/deploy.yml

@@ -6,8 +6,6 @@ permissions:
 
 # default versions. This is overwritten by distros_tags.sh
 env:
-  GEMC_TAG: dev           # default gemc tag
-  GEANT4_TAG: 11.4.1      # default geant4 tag
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
 concurrency:
@@ -116,8 +114,8 @@ jobs:
           python3 ci/dockerfile_creator.py \
           -i "${{ matrix.image }}" \
           -t "${{ matrix.image_tag }}" \
-          --gemc-version "${{ matrix.gemc_tag || env.GEMC_TAG }}" \
-          --geant4-version "${{ matrix.geant4_tag || env.GEANT4_TAG }}" \
+          --gemc-version "${{ matrix.gemc_tag }}" \
+          --geant4-version "${{ matrix.geant4_tag }}" \
           --with-package \
           --source context \
           --package-arch "${{ matrix.arch }}" \

examples/meson.build

@@ -5,16 +5,22 @@ sql_db = get_option('prefix') + '/examples/gemc.db'
 
 install_subdir(meson.current_source_dir(), install_dir : '.')
 
-# Test all solid creators
+gemc_analyzer = find_program('gemc-analyzer', dirs : [venv_bin])
+
+# Test all solid creators.
+# Optional keys:
+#   plot_var  – variable name to histogram from the digitized stream (ascii, default variation only)
+#   plot_yvsx – if true, plot avgx vs avgy from the true-info stream (ascii, default variation only)
 examples_map = {
     'basic' : {
-        'simple_flux' : { 'runs' : ['1'], 'variations' : ['default'] },
-        'b1' : { 'runs' : ['1'], 'variations' : ['default', 'test'] },
-        'b2' : { 'runs' : ['1', '11'], 'variations' : ['default', 'alt'] },
+        'simple_flux' : { 'runs' : ['1'], 'variations' : ['default'], 'plot_var' : 'totEdep' },
+        'b1' : { 'runs' : ['1'], 'variations' : ['default', 'test'], 'plot_var' : 'dose', 'n_events' : '50' },
+        'b2' : { 'runs' : ['1', '11'], 'variations' : ['default', 'alt'], 'plot_var' : 'totEdep' },
         'b3' : { 'runs' : ['1', '11'], 'variations' : ['default', 'alt'] }
     },
     'optical' : {
-        'cherenkov' : { 'runs' : ['1'], 'variations' : ['default', 'mediumIndexRadiator', 'highIndexRadiator'] },
+        'cherenkov' : { 'runs' : ['1'], 'variations' : ['default', 'mediumIndexRadiator', 'highIndexRadiator'],
+                        'plot_yvsx' : true },
     }
 }
 
@@ -91,5 +97,43 @@ foreach branch : examples_map.keys()
             endforeach
 
         endforeach
+
+        # CSV output run + plot tests — one dedicated gemc run per example with a csv streamer,
+        # placed after all ascii/root runs (priority -15) so geometry is already built.
+        plot_var = config.get('plot_var', '')
+        do_yvsx  = config.get('plot_yvsx', false)
+        if plot_var != '' or do_yvsx
+            csv_base   = test_outdir + '/' + branch + '_' + example + '_csv'
+            n_events   = config.get('n_events', '')
+            n_events_arg = n_events != '' ? ['-n=' + n_events] : []
+            test('examples_run_csv_' + branch + '_' + example,
+                 gemc,
+                 args : [yaml_file,
+                         '-gsystem="[{name: ' + example + ', factory: ascii}]"',
+                         '-gstreamer="[{format: csv, filename: ' + csv_base + '}]"'] + n_events_arg,
+                 workdir : example_dir,
+                 is_parallel : false,
+                 priority : -15)
+            if plot_var != ''
+                test('examples_plot_' + branch + '_' + example,
+                     gemc_analyzer,
+                     args : [csv_base + '_t0_digitized.csv', plot_var,
+                             '--save', test_outdir + '/' + branch + '_' + example + '_plot.png'],
+                     workdir : example_dir,
+                     is_parallel : false,
+                     priority : -20)
+            endif
+            if do_yvsx
+                test('examples_plot_yvsx_' + branch + '_' + example,
+                     gemc_analyzer,
+                     args : [csv_base + '_t0_true_info.csv',
+                             '--kind', 'csv', '--data', 'true_info', '--plot', 'yvsx',
+                             '--xlim', '-55', '55', '--ylim', '-55', '55',
+                             '--save', test_outdir + '/' + branch + '_' + example + '_yvsx.png'],
+                     workdir : example_dir,
+                     is_parallel : false,
+                     priority : -20)
+            endif
+        endif
     endforeach
 endforeach

meson.build

@@ -194,11 +194,12 @@ foreach L : LD
             example_sources = sources_and_arguments[0] + qrc_examples_compiled_sources
             arguments = sources_and_arguments[1]
 
+            example_deps = this_deps + [zlib_dep]
             exe = executable(
                 name,
                 example_sources,
                 install : true,
-                dependencies : this_deps,
+                dependencies : example_deps,
                 include_directories : all_includes + ('gemc' / this_lib_name) + additional_includes,
                 link_with : this_library_link_with,
                 # Builds the executable as a PIE (position-independent executable).

releases/0.3.md

@@ -11,6 +11,7 @@ This version includes:
 - `GEMC_PLUGIN_PATH` and `-plugin_path` for external plugin discovery
 - Pre-parse plugin options hook for dynamic plugin option registration
 - ROOT gstreamer and event-action bug fixes
+- Plotting tests for digitizing-SD examples and Cherenkov photon hit maps
 
 <br/>
 
@@ -99,6 +100,17 @@ This version includes:
   executable in `PATH`.
 - Updated the Cherenkov optical example with neutral demonstration radiator names:
   `lowIndexRadiator`, `mediumIndexRadiator`, and `highIndexRadiator`.
+- Simplified the Test workflow so it runs directly inside the matching
+  `ghcr.io/gemc/g4install:<geant4>-<os>-<tag>` job container instead of
+  generating and building a temporary Dockerfile.
+- Consolidated Test, Sanitize, and Deploy matrix generation in
+  `ci/distros_tags.sh`; the shared matrix source now emits normal build,
+  sanitizer, and manifest matrices with consistent image, Geant4, runner, and
+  container fields.
+- Reduced sanitizer-build static linkage by allowing GEMC internal libraries to
+  follow Meson's `default_library` option and selecting shared GEMC libraries
+  for sanitizer builds, avoiding static-TLS pressure when tests load plugins
+  with `dlopen`.
 - Added y-vs-x analyzer plotting support in `pygemc` and used it for the
   Cherenkov homepage plots.
 - Reorganized all source modules under a `gemc/` subdirectory and adopted
@@ -163,7 +175,18 @@ This version includes:
   removed the manual Geant4 container build from the analysis workflow.
 - Made installed examples database generation skip cleanly when sanitizer
   builds intentionally skip installing the Python environment.
+- Made the Test and Sanitize workflows use the same runner/container execution
+  model and shared matrix source; Sanitize differs only by passing the sanitizer
+  option to `ci/build.sh` and by naming sanitizer log artifacts.
+- Switched sanitizer builds to shared GEMC project libraries so plugin-loading
+  tests avoid Linux/aarch64 static TLS exhaustion from sanitizer-instrumented
+  static archives.
 - Added analyzer coverage in `pygemc` for y-vs-x plotting and CLI image output.
+- Added `gemc-analyzer` plot tests to the examples test suite: examples with a digitizing SD
+  (`simple_flux`, `b1`, `b2`) get a dedicated CSV gemc run at priority -15 feeding into a
+  `gemc-analyzer` histogram test at priority -20; `b1` overrides `n` to 50 events so the
+  dosimeter fires reliably (a 6 MeV gamma has only ~27% interaction probability per event in
+  bone). The Cherenkov example gets a y-vs-x photon hit-position map from its true-info stream.
 
 <br/>
 
@@ -287,6 +310,18 @@ Both x86_64 and ARM64 platforms are supported.
   `GEMC_SKIP_PYTHON_ENV_INSTALL=1` or the installed `python_env` interpreter is
   absent, fixing sanitizer installs that intentionally omit the Python
   environment.
+- Replaced the sanitizer-specific matrix generator with `matrix_sanitize`
+  output from `ci/distros_tags.sh`, keeping the sanitizer matrix on the same OS,
+  architecture, Geant4, runner, and container definitions as the Test and Deploy
+  matrices.
+- Changed the Test workflow to source the `g4install` container entrypoint, load
+  the selected Geant4 module, and run `ci/build.sh` directly in the job
+  container; logs are packaged from `/root/src/logs` without a BuildKit
+  logs-export stage.
+- Changed the GEMC Meson module loop from `static_library()` to `library()` so
+  sanitizer CI can request shared project libraries with
+  `-Ddefault_library=shared -Ddefault_both_libraries=shared` while normal builds
+  keep the default static-library behavior.
 - Better generator statistics for some examples
 - Api and analyzer moved to pygemc module 
 - Examples and tests adapted to use pygemc
@@ -350,6 +385,14 @@ Both x86_64 and ARM64 platforms are supported.
   the fallback warning. The Lund file reader pre-converts its computed doubles
   via `gutilities::getG4Number(value, unit)` before passing them to the
   constructor.
+- Added `gemc-analyzer` plot tests to `examples/meson.build`: the `examples_map` gains optional
+  `plot_var`, `plot_yvsx`, and `n_events` keys. For each example that carries one of these keys,
+  a dedicated `examples_run_csv_<branch>_<example>` test (priority -15) runs `gemc` with
+  `factory: ascii` and a CSV streamer, then `examples_plot_<branch>_<example>` (priority -20)
+  invokes `gemc-analyzer` to save a PNG. `simple_flux` and `b2` plot `totEdep`; `b1` plots
+  `dose` with `n_events: 50` so enough gammas traverse the bone dosimeter. The Cherenkov example
+  uses `plot_yvsx: true` to generate a 2D `avgx`-vs-`avgy` photon hit-position map from
+  its true-info stream with ±55 cm axis limits.
 - Added `gemc::collectPluginOptions(int argc, char* argv[])` declared in `gemc_options.h` and
   implemented in `gemc_options.cc`. Before the main `GOptions` parsing constructor is called in
   `main()`, GEMC scans every YAML file listed in `argv` for `gsystem` entries, resolves each