From 5a962c6d24f8380ccd28127b3a91de6aebd30e20 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Wed, 18 Jan 2023 11:25:41 +0100 Subject: [PATCH 1/8] update CI image --- .github/workflows/validation.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index c0d77d91c..a57fd0807 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -33,7 +33,7 @@ jobs: name: Build and run tests runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest steps: - uses: actions/checkout@v3 - name: Build and install @@ -52,7 +52,7 @@ jobs: name: Build and cache installation runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest steps: - uses: actions/checkout@v3 - name: Build and install @@ -84,7 +84,7 @@ jobs: name: "Previous Version File Compatibility" runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -107,7 +107,7 @@ jobs: name: "Macros with clean error output" runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -135,7 +135,7 @@ jobs: name: "PyROOT" runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest needs: [ framework-install ] steps: - name: Restore cache @@ -153,7 +153,7 @@ jobs: name: "Metadata" runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -205,7 +205,7 @@ jobs: name: "PandaX-III" runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -293,7 +293,7 @@ jobs: name: "TREX-DM" runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -346,7 +346,7 @@ jobs: name: Run examples runs-on: ubuntu-latest container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics + image: ghcr.io/rest-for-physics/base:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 From 56e2368d65b2649e291df6ff34ddbf761984975a Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Tue, 14 Feb 2023 09:41:19 +0100 Subject: [PATCH 2/8] update ci image name --- .github/workflows/validation.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index ac2df4953..1c50b22f6 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -32,7 +32,7 @@ jobs: name: Build and run tests runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest steps: - uses: actions/checkout@v3 - name: Build and install @@ -51,7 +51,7 @@ jobs: name: Build and cache installation runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest steps: - uses: actions/checkout@v3 - name: Build and install @@ -83,7 +83,7 @@ jobs: name: "Previous Version File Compatibility" runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -106,7 +106,7 @@ jobs: name: "Macros with clean error output" runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -134,7 +134,7 @@ jobs: name: "PyROOT" runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest needs: [ framework-install ] steps: - name: Restore cache @@ -152,7 +152,7 @@ jobs: name: "Metadata" runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -204,7 +204,7 @@ jobs: name: "PandaX-III" runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -292,7 +292,7 @@ jobs: name: "TREX-DM" runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 @@ -345,7 +345,7 @@ jobs: name: Run examples runs-on: ubuntu-latest container: - image: ghcr.io/rest-for-physics/base:latest + image: ghcr.io/rest-for-physics/root-garfield-geant4:latest needs: [ framework-install ] steps: - uses: actions/checkout@v3 From af1c2f2a3836733ab21e45251b14f332f0c9c1fa Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Mon, 8 May 2023 12:55:09 +0200 Subject: [PATCH 3/8] attempt to always upload cache --- .github/workflows/validation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 308fa9594..e68e0c758 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -72,6 +72,7 @@ jobs: with: key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} + upload-when-found: true - name: Upload Artifacts uses: actions/upload-artifact@v3 with: From fbd3ffb5dc53077aec362f7de39ed5f682034530 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Mon, 8 May 2023 13:18:37 +0200 Subject: [PATCH 4/8] use different key name for ref version --- .github/workflows/validation.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index e68e0c758..2db23e6a5 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -461,10 +461,9 @@ jobs: id: framework-install-cache-reference uses: actions/cache@v3 with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-ref-${{ github.sha }} path: ${{ env.REST_PATH }} - pandax-iii-reference: name: "PandaX-III on reference version" runs-on: ubuntu-latest @@ -484,7 +483,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-ref-${{ github.sha }} path: ${{ env.REST_PATH }} - name: 02_PandaXiiiMC run: | @@ -554,7 +553,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-ref-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Test Metadata run: | From 764e7f62603fdbdbbbe03077316f90ae9f45cd2b Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Mon, 8 May 2023 13:19:38 +0200 Subject: [PATCH 5/8] remove bad option --- .github/workflows/validation.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 2db23e6a5..234060d05 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -72,7 +72,6 @@ jobs: with: key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - upload-when-found: true - name: Upload Artifacts uses: actions/upload-artifact@v3 with: From dabd3f76c8e1f568fd5a42e4875cbf58c73be063 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Mon, 8 May 2023 13:40:03 +0200 Subject: [PATCH 6/8] use more explicit cache key names --- .github/workflows/validation.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 234060d05..c46df6351 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -70,7 +70,7 @@ jobs: id: framework-install-cache uses: actions/cache@v3 with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Upload Artifacts uses: actions/upload-artifact@v3 @@ -94,7 +94,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Open V2.2 file run: | @@ -117,7 +117,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Load restRootMacros run: | @@ -141,7 +141,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Test REST classes in PyROOT run: | @@ -167,7 +167,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} # Not used in gitlab pipeline, checks $CI_SERVER_HOST - name: Load Gas @@ -219,7 +219,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} - name: 02_PandaXiiiMC run: | @@ -307,7 +307,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} - name: TREX-DM Latest Data run: | @@ -360,7 +360,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Test Metadata run: | @@ -460,7 +460,7 @@ jobs: id: framework-install-cache-reference uses: actions/cache@v3 with: - key: ${{ env.BRANCH_NAME }}-ref-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-ref-${{ github.sha }} path: ${{ env.REST_PATH }} pandax-iii-reference: @@ -482,7 +482,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ env.BRANCH_NAME }}-ref-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-ref-${{ github.sha }} path: ${{ env.REST_PATH }} - name: 02_PandaXiiiMC run: | @@ -552,7 +552,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ env.BRANCH_NAME }}-ref-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-framework-ref-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Test Metadata run: | From 6e59989ff3d8718d62f2d8b4de110159b27690b0 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Sat, 24 Feb 2024 16:38:54 +0100 Subject: [PATCH 7/8] docker image --- .github/workflows/validation.yml | 154 ++++++++++++++++++++++++++++--- 1 file changed, 141 insertions(+), 13 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index e92d0bd77..0788092fc 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -70,7 +70,7 @@ jobs: id: framework-install-cache uses: actions/cache@v3 with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Upload Artifacts uses: actions/upload-artifact@v3 @@ -94,7 +94,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Open V2.2 file run: | @@ -117,7 +117,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Load restRootMacros run: | @@ -141,7 +141,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Test REST classes in PyROOT run: | @@ -167,7 +167,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} # Not used in gitlab pipeline, checks $CI_SERVER_HOST - name: Load Gas @@ -211,17 +211,74 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - - name: PandaXIII Geant4 + - name: 02_PandaXiiiMC run: | source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_MC restG4 ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Xe136bb0n.rml -o Xe136bb0n.root + restRoot -b -q ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Validate.C'("Xe136bb0n.root")' + # - name: 02_PandaXiiiMC small for reference # We can use these artifacts to update the validation reference file + # run: | + # source ${{ env.REST_PATH }}/thisREST.sh + # cd framework/pipeline/pandaxiii_MC + # restG4 ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Xe136bb0n.rml -o Xe136bb0n_small_reference_pipeline.root -n 5 + # restManager --c AllProcesses.rml --i Xe136bb0n_small_reference_pipeline.root --o Xe136bb0n_small_reference_processed_pipeline.root + # restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed_pipeline.root", "Xe136bb0n_validation_pipeline.root")' + # - name: Upload Artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: Xe136bb + # path: | + # framework/pipeline/pandaxiii_MC/Xe136bb0n.root + # framework/pipeline/pandaxiii_MC/Xe136bb0n_small_reference_pipeline.root + # framework/pipeline/pandaxiii_MC/Xe136bb0n_small_reference_processed_pipeline.root + # framework/pipeline/pandaxiii_MC/Xe136bb0n_validation_pipeline.root + # retention-days: 1 + - name: PandaXIII Topological + run: | + source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_MC + restManager --c AllProcesses.rml --i Xe136bb0n_small_reference.root --o Xe136bb0n_small_reference_processed.root + restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed.root")' + restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")' + # restManager --c plots.rml --i Xe136bb0n_small_reference_processed.root + # This command is failing in the docker, reproducible locally, not clear why... + # echo | sleep 5 | restManager --c plots.rml --i testOutput.root + # - name: Upload Artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: PandaTrackParam + # path: framework/pipeline/pandaxiii_MC/trackParameter.png + # retention-days: 1 + - name: PandaXIII Topological from Geant4 + run: | + source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_MC + echo "using just-generated g4 file" + restManager --c AllProcesses.rml --i Xe136bb0n.root --o Xe136bb0n_processed.root --j 1 --e 5 + restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_processed.root")' + restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: PandaTestOutput + path: framework/pipeline/pandaxiii_MC/Xe136bb0n_processed.root + retention-days: 1 - name: PandaXIII Data run: | source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/panda-x + cd framework/pipeline/pandaxiii_data restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 + restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' + restRoot -b -q ../ValidateTrees.C'("validation.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: PandaTriggerRate + path: framework/pipeline/pandaxiii_data/TriggerRate.png + retention-days: 1 trex-dm: name: "TREX-DM" @@ -242,13 +299,13 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: TREX-DM Latest Data run: | source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/trex - wget https://rest-for-physics.github.io/trexdm-readouts/readouts_v2.4.root + wget https://sultan.unizar.es/trexdm-readouts/readouts_v2.4.root restManager --c 01_raw.rml --f R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs restManager --c 02_signal.rml --f RawData_01928.root restManager --c 03_hits.rml --f Signals_01928.root @@ -295,7 +352,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ env.BRANCH_NAME }}-framework-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Test Metadata run: | @@ -395,9 +452,80 @@ jobs: id: framework-install-cache-reference uses: actions/cache@v3 with: - key: ${{ env.BRANCH_NAME }}-framework-ref-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} + + pandax-iii-reference: + name: "PandaX-III on reference version" + runs-on: ubuntu-latest + container: + image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022 + needs: [ framework-install-reference ] + steps: + - uses: actions/checkout@v3 + with: + repository: rest-for-physics/framework + path: framework + - name: Checkout framework branch + run: | + cd framework + ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} + - name: Restore cache + uses: actions/cache@v3 + id: framework-install-cache-reference + with: + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + path: ${{ env.REST_PATH }} + - name: 02_PandaXiiiMC + run: | + source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_MC + restG4 ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Xe136bb0n.rml -o Xe136bb0n.root + restRoot -b -q ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Validate.C'("Xe136bb0n.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: Xe136bbRef + path: framework/pipeline/pandaxiii_MC/Xe136bb0n.root + retention-days: 1 + - name: PandaXIII Topological + run: | + source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_MC + restManager --c AllProcesses.rml --i Xe136bb0n_small_reference.root --o Xe136bb0n_small_reference_processed.root --j 1 --e 5 + restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed.root")' + restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")' + # restManager --c plots.rml --i Xe136bb0n_small_reference_processed.root + - name: PandaXIII Topological from Geant4 + run: | + source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_MC + echo "using just-generated g4 file" + restManager --c AllProcesses.rml --i Xe136bb0n.root --o Xe136bb0n_processed.root --j 1 --e 5 + restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_processed.root")' + # TODO: regenerate reference file + # restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation_G4_v10.4.3.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: PandaTestOutputRef + path: framework/pipeline/pandaxiii_MC/Xe136bb0n_processed.root + retention-days: 1 + - name: PandaXIII Data + run: | + source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_data + restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 + restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' + restRoot -b -q ../ValidateTrees.C'("validation.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: PandaTriggerRateRef + path: framework/pipeline/pandaxiii_data/TriggerRate.png + retention-days: 1 + examples-reference: name: Run examples on reference version runs-on: ubuntu-latest @@ -417,7 +545,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ env.BRANCH_NAME }}-framework-ref-${{ github.sha }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Test Metadata run: | From 7d5e519ab937c6973a1a233db4b2c91423802b42 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Sat, 24 Feb 2024 16:40:28 +0100 Subject: [PATCH 8/8] docker image --- .github/workflows/validation.yml | 134 +------------------------------ 1 file changed, 3 insertions(+), 131 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 0788092fc..413a0ea7d 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -213,72 +213,15 @@ jobs: with: key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - - name: 02_PandaXiiiMC + - name: PandaXIII Geant4 run: | source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_MC restG4 ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Xe136bb0n.rml -o Xe136bb0n.root - restRoot -b -q ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Validate.C'("Xe136bb0n.root")' - # - name: 02_PandaXiiiMC small for reference # We can use these artifacts to update the validation reference file - # run: | - # source ${{ env.REST_PATH }}/thisREST.sh - # cd framework/pipeline/pandaxiii_MC - # restG4 ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Xe136bb0n.rml -o Xe136bb0n_small_reference_pipeline.root -n 5 - # restManager --c AllProcesses.rml --i Xe136bb0n_small_reference_pipeline.root --o Xe136bb0n_small_reference_processed_pipeline.root - # restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed_pipeline.root", "Xe136bb0n_validation_pipeline.root")' - # - name: Upload Artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: Xe136bb - # path: | - # framework/pipeline/pandaxiii_MC/Xe136bb0n.root - # framework/pipeline/pandaxiii_MC/Xe136bb0n_small_reference_pipeline.root - # framework/pipeline/pandaxiii_MC/Xe136bb0n_small_reference_processed_pipeline.root - # framework/pipeline/pandaxiii_MC/Xe136bb0n_validation_pipeline.root - # retention-days: 1 - - name: PandaXIII Topological - run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_MC - restManager --c AllProcesses.rml --i Xe136bb0n_small_reference.root --o Xe136bb0n_small_reference_processed.root - restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed.root")' - restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")' - # restManager --c plots.rml --i Xe136bb0n_small_reference_processed.root - # This command is failing in the docker, reproducible locally, not clear why... - # echo | sleep 5 | restManager --c plots.rml --i testOutput.root - # - name: Upload Artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: PandaTrackParam - # path: framework/pipeline/pandaxiii_MC/trackParameter.png - # retention-days: 1 - - name: PandaXIII Topological from Geant4 - run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_MC - echo "using just-generated g4 file" - restManager --c AllProcesses.rml --i Xe136bb0n.root --o Xe136bb0n_processed.root --j 1 --e 5 - restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_processed.root")' - restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: PandaTestOutput - path: framework/pipeline/pandaxiii_MC/Xe136bb0n_processed.root - retention-days: 1 - name: PandaXIII Data run: | source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_data + cd framework/pipeline/panda-x restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 - restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' - restRoot -b -q ../ValidateTrees.C'("validation.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: PandaTriggerRate - path: framework/pipeline/pandaxiii_data/TriggerRate.png - retention-days: 1 trex-dm: name: "TREX-DM" @@ -305,7 +248,7 @@ jobs: run: | source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/trex - wget https://sultan.unizar.es/trexdm-readouts/readouts_v2.4.root + wget https://rest-for-physics.github.io/trexdm-readouts/readouts_v2.4.root restManager --c 01_raw.rml --f R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs restManager --c 02_signal.rml --f RawData_01928.root restManager --c 03_hits.rml --f Signals_01928.root @@ -455,77 +398,6 @@ jobs: key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - - pandax-iii-reference: - name: "PandaX-III on reference version" - runs-on: ubuntu-latest - container: - image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022 - needs: [ framework-install-reference ] - steps: - - uses: actions/checkout@v3 - with: - repository: rest-for-physics/framework - path: framework - - name: Checkout framework branch - run: | - cd framework - ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} - - name: Restore cache - uses: actions/cache@v3 - id: framework-install-cache-reference - with: - key: ${{ env.BRANCH_NAME }}-${{ github.sha }} - path: ${{ env.REST_PATH }} - - name: 02_PandaXiiiMC - run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_MC - restG4 ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Xe136bb0n.rml -o Xe136bb0n.root - restRoot -b -q ${{ env.REST_PATH }}/examples/restG4/05.PandaXIII/Validate.C'("Xe136bb0n.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: Xe136bbRef - path: framework/pipeline/pandaxiii_MC/Xe136bb0n.root - retention-days: 1 - - name: PandaXIII Topological - run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_MC - restManager --c AllProcesses.rml --i Xe136bb0n_small_reference.root --o Xe136bb0n_small_reference_processed.root --j 1 --e 5 - restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_small_reference_processed.root")' - restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation.root")' - # restManager --c plots.rml --i Xe136bb0n_small_reference_processed.root - - name: PandaXIII Topological from Geant4 - run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_MC - echo "using just-generated g4 file" - restManager --c AllProcesses.rml --i Xe136bb0n.root --o Xe136bb0n_processed.root --j 1 --e 5 - restRoot -b -q ../MakeBasicTree.C'("Xe136bb0n_processed.root")' - # TODO: regenerate reference file - # restRoot -b -q ../ValidateTrees.C'("Xe136bb0n_validation_G4_v10.4.3.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: PandaTestOutputRef - path: framework/pipeline/pandaxiii_MC/Xe136bb0n_processed.root - retention-days: 1 - - name: PandaXIII Data - run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd framework/pipeline/pandaxiii_data - restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 - restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' - restRoot -b -q ../ValidateTrees.C'("validation.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: PandaTriggerRateRef - path: framework/pipeline/pandaxiii_data/TriggerRate.png - retention-days: 1 - examples-reference: name: Run examples on reference version runs-on: ubuntu-latest