use GLMakie in some cases for examples

peremato · peremato · commit 35d912121512 · 2025-12-17T09:56:12.000+01:00
diff --git a/docs/src/examples/B4a.lit b/docs/src/examples/B4a.lit
@@ -254,7 +254,7 @@ function stepaction(step::G4Step, app::G4JLApplication)
 end
 
 # ## Making the Application
-evtdisplay   = G4JLEventDisplay(joinpath(@__DIR__, "B4aVis.jl"))
+evtdisplay   = G4JLEventDisplay(joinpath(@__DIR__, "B4aVisSettings.jl"))
 Geant4.getConstructor(::B4aDetector)::Function = B4aConstruct
 app = G4JLApplication(detector = detector,               # detector with parameters
                       simdata = B4aSimData(),            # simulation data
@@ -293,9 +293,7 @@ Plots.plot!(subplot=2, data.fEdepHist_Gap, title="Total EDep in Gaps", xlabel="E
 
 Plots.plot!(subplot=3, data.fStepLenHist_Abs, title="Total StepLeng in Absorbers", xlabel="Step Length (mm)", label="Abs_StepLen", show=true)
 Plots.plot!(subplot=4, data.fStepLenHist_Gap, title="Total StepLeng in Gaps", xlabel="Step Length (mm)", label="Gap_StepLen", show=true)
-#nb PNG(img) #hide
 #md PNG(img) #hide
-#jl display("image/png", img)
 
 
 
diff --git a/docs/src/examples/B4aVisSettings.jl b/docs/src/examples/B4aVisSettings.jl
diff --git a/docs/src/examples/GPS.lit b/docs/src/examples/GPS.lit
@@ -26,8 +26,8 @@ using Geant4.SystemOfUnits: deg
 using Parameters
 using FHist
 using Plots
-#md import DisplayAs: PNG
-#nb import DisplayAs: PNG
+#md import DisplayAs: PNG #hide
+
 
 # ## Define the Detector
 # The GPS detector is a simple box filled with air. The detector is defined by the `GPSDetector` structure.
@@ -146,9 +146,7 @@ initialize(app)
 # We run the simulation with 100000 particles and plot the results.
 beamOn(app,100000)
 img = do_plot(app.simdata[1])
-#nb PNG(img)
-#md PNG(img)
-#jl display(img)
+#md PNG(img) #hide
 
 # Let's change the GPS parameters and run the simulation again.
 ui`/gps/particle geantino`
@@ -166,6 +164,4 @@ ui`/gps/ene/intercept 1`
 
 beamOn(app,100000)
 img = do_plot(app.simdata[1])
-#nb PNG(img)
-#md PNG(img)
-#jl display(img)
+#md PNG(img) #hide
diff --git a/docs/src/examples/HBC30.lit b/docs/src/examples/HBC30.lit
@@ -21,10 +21,11 @@
 using Geant4
 using Geant4.SystemOfUnits
 using Printf, GeometryBasics
-using CairoMakie  # to force loading G4Vis extension
+## to force loading G4Vis extension we need to load the following module
+#md using CairoMakie
+#nb using CairoMakie
+#jl using GLMakie
 #md import DisplayAs: PNG #hide
-#nb import DisplayAs: PNG #hide
-
 
 # ## Define the Detector
 # The HBC30 is cylinder of 30cm filled with liquid hydrogen
@@ -183,8 +184,11 @@ s = LScene(fig[1,1])
 drawdetector(s, app)
 nexttrigger(app); drawevent(s, app)
 
-#md PNG(fig)
-#nb PNG(fig)
+#md # ```julia
+#md # display(fig)
+#md # ```
+#md PNG(fig) #hide
+#nb display(fig)
 #jl display(fig)
 
 # Change the energy and type of particle and draw the next event that triggers
@@ -197,6 +201,9 @@ s = LScene(fig[1,1])
 drawdetector(s, app)
 nexttrigger(app); drawevent(s, app)
 
-#md PNG(fig)
-#nb PNG(fig)
+#md # ```julia
+#md # display(fig)
+#md # ```
+#md PNG(fig) #hide 
+#nb display(fig)
 #jl display(fig)
diff --git a/docs/src/examples/RE03.lit b/docs/src/examples/RE03.lit
@@ -24,8 +24,7 @@
 # We will also use the `FHist` and `Plots` modules to handle the histograms and plots.
 using Geant4
 using Geant4.SystemOfUnits
-#md import DisplayAs: PNG
-#nb import DisplayAs: PNG
+#md import DisplayAs: PNG #hide
 
 # ## Define Detector structure
 # The RE03 detector is a simple box filled with air. The detector is defined by the `RE03Detector` structure.
@@ -84,6 +83,6 @@ println("Central EDep = $(sum(t[10:20,10:20,:]))")
 # center of the scoring mesh.
 using CairoMakie
 img = heatmap(t[1:30,15,1:30])
-#nb PNG(img)
-#md PNG(img)
-#jl display(img)
+
+#md PNG(img) #hide
+
diff --git a/docs/src/examples/Solids.lit b/docs/src/examples/Solids.lit
@@ -13,7 +13,9 @@
 
 using Geant4
 using Geant4.SystemOfUnits
-using CairoMakie  ## to force loading G4Vis extension
+#md using CairoMakie ## to force loading G4Vis extension
+#nb using CairoMakie ## to force loading G4Vis extension
+#jl using GLMakie ## to force loading G4Vis extension
 
 # Change the number of steps when drawing curbed surfaces from 24 (default) to 64
 HepPolyhedron!SetNumberOfRotationSteps(64)
diff --git a/docs/src/examples/TPCSim.lit b/docs/src/examples/TPCSim.lit
@@ -33,8 +33,7 @@ using PYTHIA8
 #nb using CairoMakie
 #jl using GLMakie
 using PYTHIA8: px, py, pz
-#md import DisplayAs: PNG
-#nb import DisplayAs: PNG
+#md import DisplayAs: PNG #hide
 
 
 # ## Define the TPC Detector
@@ -147,7 +146,6 @@ end
 # Overwriting the default `drawEvent` function defined in the G4Vis extension
 const G4Vis = Base.get_extension(Geant4, :G4Vis)
 function G4Vis.drawEvent(evtdisp::G4Vis.G4JLEventDisplay)
-    println("Drawing event", typeof(evtdisp))
     s = evtdisp.lscene.scene
     settings = evtdisp.settings
     trajectories = G4EventManager!GetEventManager() |> GetConstCurrentEvent |> GetTrajectoryContainer
@@ -188,12 +186,18 @@ initialize(app)
 
 # ## Run the Application
 beamOn(app, 1)
-#nb PNG(evtdisplay.figure)
-#md PNG(evtdisplay.figure)
+#md # ```julia
+#md # display(evtdisplay.figure)
+#md # ```
+#md PNG(evtdisplay.figure) #hide
+#nb display(evtdisplay.figure)
 #jl display(evtdisplay.figure)
 
 # Another event
 beamOn(app, 1)
-#nb PNG(evtdisplay.figure)
-#md PNG(evtdisplay.figure)
+#md # ```julia
+#md # display(evtdisplay.figure)
+#md # ```
+#md PNG(evtdisplay.figure) #hide
+#nb display(evtdisplay.figure)
 #jl display(evtdisplay.figure)
diff --git a/docs/src/examples/TestEm3.lit b/docs/src/examples/TestEm3.lit
@@ -64,8 +64,7 @@
 using Geant4
 using Geant4.SystemOfUnits
 using FHist, Plots, Printf
-#md import DisplayAs: PNG
-#nb import DisplayAs: PNG
+#md import DisplayAs: PNG #hide
 
 # ## Define Detector structure
 # The detector is a sandwich calorimeter made of layers of sensitive and absorber materials. The detector is defined by the `TestEm3Detector` structure.
@@ -308,16 +307,16 @@ beamOn(app, 1000)
 
 # ## Plot the results
 img = do_plot(app.simdata[1])
-#md PNG(img)
-#nb PNG(img)
+#md PNG(img) #hide
+#nb display(img)
 #jl display(img)
 
 # ### Change the primary particle enerqy and run the simulation again
 SetParticleEnergy(particlegun, 100MeV)
 beamOn(app, 1000)
 img = do_plot(app.simdata[1])
-#md PNG(img)
-#nb PNG(img)
+#md PNG(img) #hide
+#nb display(img)
 #jl display(img)
 
 # ### Change the geometry and run the simulation again
@@ -326,8 +325,8 @@ reinitialize(app, TestEm3Detector(absorThickness = [2.3mm, 5.7mm, 1mm],
                                   absorMaterial = ["G4_Pb", "G4_lAr", "G4_Al"]))
 beamOn(app, 1000)
 img = do_plot(app.simdata[1])
-#md PNG(img)
-#nb PNG(img)
+#md PNG(img) #hide
+#nb display(img)
 #jl display(img)
 
 
