less aggressive images cleanup and added explicit units in gparticle

Author: maureeungaro

.github/workflows/cleanup.yml

@@ -22,8 +22,8 @@ permissions:
   packages: write  # needed for deletions with GITHUB_TOKEN
 
 env:
-  # Untagged versions are orphaned GHCR package versions left after tags move or manifests/caches are rewritten.
-  UNTAGGED_RETENTION_HOURS: 12
+  # Keep untagged versions. GHCR exposes platform child manifests for tagged OCI indexes as untagged
+  # package versions, and deleting them can break docker pull for visible multi-arch tags.
   # Stale tagged versions still have tags, but those tags are no longer generated by the current image matrix.
   STALE_TAGGED_RETENTION_DAYS: 14
 
@@ -76,15 +76,14 @@ jobs:
           KEEP_TAGS: ${{ steps.keep-tags.outputs.json }}
           MANAGED_IMAGES: ${{ steps.keep-tags.outputs.images }}
           DRY_RUN: ${{ inputs.dry_run || 'false' }}
-          UNTAGGED_RETENTION_HOURS: ${{ env.UNTAGGED_RETENTION_HOURS }}
           STALE_TAGGED_RETENTION_DAYS: ${{ env.STALE_TAGGED_RETENTION_DAYS }}
         with:
           script: |
             const keepTags = new Set(JSON.parse(process.env.KEEP_TAGS));
             const managedImages = JSON.parse(process.env.MANAGED_IMAGES);
             const dryRun = process.env.DRY_RUN === 'true';
-            const untaggedRetentionMs = Number(process.env.UNTAGGED_RETENTION_HOURS) * 60 * 60 * 1000;
-            const staleTaggedRetentionMs = Number(process.env.STALE_TAGGED_RETENTION_DAYS) * 24 * 60 * 60 * 1000;
+            const staleTaggedRetentionMs =
+              Number(process.env.STALE_TAGGED_RETENTION_DAYS) * 24 * 60 * 60 * 1000;
             const now = Date.now();
 
             const owner = context.repo.owner;
@@ -127,9 +126,12 @@ jobs:
               const dates = `created ${version.created_at}, updated ${version.updated_at}`;
 
               let reason = null;
-              if (tags.length === 0 && ageMs > untaggedRetentionMs) {
-                reason = `untagged older than ${process.env.UNTAGGED_RETENTION_HOURS} hours`;
-              } else if (
+              if (tags.length === 0) {
+                core.info(`keep ${version.id}: ${tagList} (${dates}; may be a multi-arch child manifest)`);
+                continue;
+              }
+
+              if (
                 tags.length > 0 &&
                 ageMs > staleTaggedRetentionMs &&
                 tags.every((tag) => !keepTags.has(tag)) &&
@@ -143,7 +145,9 @@ jobs:
                 continue;
               }
 
-              core.info(`${dryRun ? 'would delete' : 'delete'} ${version.id}: ${tagList} (${reason}; ${dates})`);
+              core.info(
+                `${dryRun ? 'would delete' : 'delete'} ${version.id}: ${tagList} (${reason}; ${dates})`
+              );
               if (!dryRun) {
                 await deleteVersion({
                   ...ownerArgs,

examples/basic/b1/b1.yaml

@@ -27,8 +27,8 @@ g4camera:
 
 gparticle:
   - name: gamma
-    p: 6
-    vz: -15
-    delta_vx: 4
-    delta_vy: 4
+    p: 6*MeV
+    vz: -15*cm
+    delta_vx: 4*cm
+    delta_vy: 4*cm
     multiplicity: 1

examples/basic/b2/b2.yaml

@@ -20,8 +20,8 @@ phys_list: FTFP_BERT
 
 gparticle:
   - name: proton
-    p: 3000
-    vz: -250
+    p: 3000*MeV
+    vz: -250*cm
 
 gmultipoles:
   - name: dipole

examples/basic/b3/b3.yaml

@@ -5,10 +5,10 @@ nthreads: 4
 
 gparticle:
   - name: e-
-    p: 1500
-    theta: 23.0
-    delta_theta: 4.0
-    delta_phi: 18.0
+    p: 1500*MeV
+    theta: 23*deg
+    delta_theta: 4*deg
+    delta_phi: 18*deg
     multiplicity: 1
 
 

examples/basic/material/materials.yaml

@@ -24,8 +24,8 @@ g4camera:
 
 gparticle:
   - name: proton
-    p: 2000
-    vz: -3
-    delta_vx: 0.1
-    delta_vy: 0.1
+    p: 2000*MeV
+    vz: -3*cm
+    delta_vx: 0.1*cm
+    delta_vy: 0.1*cm
     multiplicity: 1

examples/basic/pyvista/pyvista.yaml

@@ -14,8 +14,8 @@ phys_list: QBBC
 
 gparticle:
   - name: proton
-    p: 1000
-    vz: -5
-    delta_vx: 0.5
-    delta_vy: 0.5
+    p: 1000*MeV
+    vz: -5*cm
+    delta_vx: 0.5*cm
+    delta_vy: 0.5*cm
     multiplicity: 5

examples/basic/simple_flux/simple_flux.yaml

@@ -20,8 +20,8 @@ phys_list: QBBC
 
 gparticle:
   - name: proton
-    p: 2000
-    vz: -3
-    delta_vx: 0.1
-    delta_vy: 0.1
+    p: 2000*MeV
+    vz: -3*cm
+    delta_vx: 0.1*cm
+    delta_vy: 0.1*cm
     multiplicity: 10

examples/optical/cherenkov/cherenkov.yaml

@@ -24,5 +24,5 @@ phys_list: FTFP_BERT + G4OpticalPhysics
 
 gparticle:
   - name: e-
-    p: 1000
-    vz: -50
+    p: 1000*MeV
+    vz: -50*cm

gemc/gparticle/examples/gparticle_example.cc

@@ -12,7 +12,7 @@
  *
  * Usage example (shell):
  * @code
- * ./gparticle_example -gparticle="[{name: e-, p: 5000, punit: MeV}]"
+ * ./gparticle_example -gparticle="[{name: e-, p: 5000*MeV, theta: 23*deg}]"
  * @endcode
  *
  * Notes:

gemc/gparticle/examples/point_particle.yaml

@@ -1,4 +1,4 @@
 gparticle:
   - name: e-
-    p: 2300
-    theta: 23.0
+    p: 2300*MeV
+    theta: 23*deg