rest-for-physics · jgalan · Nov 17, 2022 · Sep 2, 2022 · Sep 2, 2022 · Sep 2, 2022
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Build and install
         uses: rest-for-physics/framework/.github/actions/build@master
         with:
-          cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DREST_WELCOME=ON -DRESTLIB_AXION=ON"
+          cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DREST_WELCOME=ON -DRESTLIB_AXION=ON -DREST_MPFR=ON"
           branch: ${{ env.BRANCH_NAME }}
       - name: Cache framework installation
         id: axionlib-install-cache
@@ -50,6 +50,55 @@ jobs:
           key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
           path: ${{ env.REST_PATH }}
 
+  macros-health:
+    name: "Macros with clean error output"
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+    needs: [ build-axionlib ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Restore cache
+        uses: actions/cache@v3
+        id: axionlib-install-cache
+        with:
+          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+          path: ${{ env.REST_PATH }}
+      - name: Load restRootMacros in axiolib standalone
+        run: |
+          source ${{ env.REST_PATH }}/thisREST.sh
+          cd pipeline
+          export DISPLAY=localhost:0.0
+          echo "Running validation script"
+          python3 validateMacros.py
+
+  Physics:
+    name: Check physics
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+    needs: [ build-axionlib ]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Restore cache
+      uses: actions/cache@v3
+      id: axionlib-install-cache
+      with:
+        key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+        path: ${{ env.REST_PATH }}
+    - name: Basic physics tests
+      run: |
+        source ${{ env.REST_PATH }}/thisREST.sh
+        cd pipeline/physics/
+        wget https://sultan.unizar.es/axionlib-data/bufferGas/He.abs
+        wget https://sultan.unizar.es/axionlib-data/bufferGas/He.nff
+        wget https://sultan.unizar.es/axionlib-data/bufferGas/Ne.abs
+        wget https://sultan.unizar.es/axionlib-data/bufferGas/Ne.nff
+        wget https://sultan.unizar.es/axionlib-data/bufferGas/bufferGases.rml
+        wget https://sultan.unizar.es/axionlib-data/magneticField/fields.rml
+        wget https://sultan.unizar.es/axionlib-data/magneticField/Bykovskiy_201906.dat
+        restRoot -b -q AxionPhysicsValidation.C
+
   Metadata:
     name: Check metadata
     runs-on: ubuntu-latest
@@ -134,12 +183,13 @@ jobs:
         source ${{ env.REST_PATH }}/thisREST.sh
         export REST_NEVENTS=1000
         export REST_RUN=100
+        cd pipeline/ray-tracing/optics/
         wget https://rest-for-physics.github.io/axionlib-data/optics/xmm.rml
         wget https://rest-for-physics.github.io/axionlib-data/optics/XMM.Wolter
         wget https://rest-for-physics.github.io/axionlib-data/opticsMirror/Reflectivity_Single_Au_250_Ni_0.4.N901f
         wget https://rest-for-physics.github.io/axionlib-data/opticsMirror/Transmission_Single_Au_250_Ni_0.4.N901f
         restManager --c opticsBench.rml
-        restRoot ValidateXMM.C'("OpticsBench_Yaw_0.02_Dev_0.005_BabyIAXO_Run00100.root")'
+        restRoot -b -q ValidateXMM.C'("OpticsBench_Yaw_0.05_Dev_0.005_BabyIAXO_Run00100.root")'
     - name: Window transmission
       run: |
         source ${{ env.REST_PATH }}/thisREST.sh
@@ -150,4 +200,15 @@ jobs:
         restManager --c shiftedWindow.rml
         restRoot ValidateTransmission.C'("ShiftedVacuumWindow", 0.3, 0.5)'
         restManager --c siWindow.rml
-        restRoot ValidateTransmission.C'("SiWindow.root", 0.9, 1)'
+        restRoot -b -q ValidateTransmission.C'("SiWindow.root", 0.9, 1)'
+    - name: Axion-field integration
+      run: |
+        source ${{ env.REST_PATH }}/thisREST.sh
+        cd pipeline/ray-tracing/axion-field/
+        wget https://rest-for-physics.github.io/axionlib-data/magneticField/fields.rml
+        wget https://rest-for-physics.github.io/axionlib-data/magneticField/Bykovskiy_201906.dat
+        wget https://sultan.unizar.es/axionlib-data/bufferGas/He.abs
+        wget https://sultan.unizar.es/axionlib-data/bufferGas/He.nff
+        wget https://rest-for-physics.github.io/axionlib-data/bufferGas/bufferGases.rml
+        restManager --c photonConversion.rml
+        restRoot -b -q Validate.C
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ build:
     - cd ../../../
     - mkdir build
     - cd build
-    - cmake ../ -DREST_SOLAXFLUX=OFF -DREST_WELCOME=ON -DRESTLIB_AXION=ON -DREST_GARFIELD=OFF -DREST_G4=OFF -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DMPFR_PATH=${CI_PROJECT_DIR}/mpfr-4.0.2/install
+    - cmake ../ -DREST_SOLAXFLUX=OFF -DREST_WELCOME=ON -DRESTLIB_AXION=ON -DREST_GARFIELD=OFF -DREST_G4=OFF -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install -DMPFR_PATH=${CI_PROJECT_DIR}/mpfr-4.0.2/install -DREST_MPFR=ON
     - make install -j2
       #    - . ${CI_PROJECT_DIR}/framework/source/libraries/axion/external/solarAxionFlux/bin/thisSolarAxionFluxLib.sh
     - . ${CI_PROJECT_DIR}/install/thisREST.sh

diff --git a/data b/data
diff --git a/examples/likelihood_BabyIAXO.rml b/examples/likelihood_BabyIAXO.rml
diff --git a/examples/likelihood_BabyIAXO_2.rml b/examples/likelihood_BabyIAXO_2.rml
diff --git a/examples/metadata.rml b/examples/metadata.rml
diff --git a/examples/axionGenerator.rml → examples/old/axionGenerator.rml b/examples/axionGenerator.rml → examples/old/axionGenerator.rml
diff --git a/examples/axionSpectrum.xml → examples/old/axionSpectrum.xml b/examples/axionSpectrum.xml → examples/old/axionSpectrum.xml
diff --git a/examples/axionlib.xml → examples/old/axionlib.xml b/examples/axionlib.xml → examples/old/axionlib.xml
diff --git a/examples/bField_BabyIAXO.rml → examples/old/bField_BabyIAXO.rml b/examples/bField_BabyIAXO.rml → examples/old/bField_BabyIAXO.rml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-
-<TRestAxionMagneticField name="bFieldBabyIAXO" title="bFieldBabyIAXO" verboseLevel="warning" >
-    <addMagneticVolume fileName="mag1.dat" position="(0,750,0)mm" />
-    <addMagneticVolume fileName="mag1.dat" position="(0,-750,0)mm" />
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<TRestAxionMagneticField name="bFieldBabyIAXO" title="bFieldBabyIAXO" verboseLevel="warning">
+    <addMagneticVolume fileName="mag1.dat" position="(0,750,0)mm"/>
+    <addMagneticVolume fileName="mag1.dat" position="(0,-750,0)mm"/>
 </TRestAxionMagneticField>
diff --git a/examples/old/likelihood_BabyIAXO.rml b/examples/old/likelihood_BabyIAXO.rml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<axion>
+    <TRestAxionSolarModel name="sunPrimakoff" verboseLevel="debug">
+        <parameter name="mode" value="table"/>
+        <parameter name="solarAxionModel" value="Primakoff_Gianotti_201904.dat"/>
+        <!-- <parameter name="solarAxionModel" value="arXiv_0702006_Primakoff"/> -->
+    </TRestAxionSolarModel>
+    <TRestAxionLikelihood name="babyIAXO" verboseLevel="debug">
+        <parameter name="Bmag" value="1.73T"/>
+        <parameter name="Rmag" value="35cm"/>
+        <parameter name="Lmag" value="10m"/>
+        <parameter name="efficiency" value="0.35*0.7"/>
+        <parameter name="bckLevel" value="1.e-7"/>
+        <parameter name="expTimeVacuum" value="1.5*365*12"/>
+        <!--<parameter name="expTimePerStep" value="1.5*365.*12./50."/>-->
+        <parameter name="expTimePerStep" value="-1"/>
+        <parameter name="pressureSteps" value="150"/>
+        <!-- Spot in cm2 -->
+        <parameter name="spotArea" value="0.3"/>
+        <!-- Helium density in g/cm3 -->
+        <parameter name="lastStepDensity" value="0.1789e-3"/>
+        <parameter name="energyRange" value="(1,8)"/>
+    </TRestAxionLikelihood>
+</axion>
diff --git a/examples/old/likelihood_BabyIAXO_2.rml b/examples/old/likelihood_BabyIAXO_2.rml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<TRestAxionLikelihood name="babyIAXO" title="It's me" verboseLevel="debug">
+    <parameter name="Bmag" value="1000G"/>
+    <parameter name="Rmag" value="30cm"/>
+    <parameter name="Lmag" value="4m"/>
+    <parameter name="efficiency" value="0.5"/>
+    <parameter name="bckLevel" value="1.e-7"/>
+    <parameter name="expTimeVacuum" value="2*365*18"/>
+    <parameter name="expTimePerStep" value="3*18"/>
+    <parameter name="pressureSteps" value="100"/>
+</TRestAxionLikelihood>
diff --git a/examples/old/metadata.rml b/examples/old/metadata.rml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<axion>
+    <TRestAxionMagneticField name="bFieldBabyIAXO" title="bFieldBabyIAXO">
+        <addMagneticVolume fileName="Bykovskiy_201906.dat" position="(0,0,0)mm"/>
+        <!--<addMagneticVolume fileName="Bykovskiy_201906.dat" position="(0,750,0)mm" />
+        <addMagneticVolume fileName="Bykovskiy_201906.dat" position="(0,-750,0)mm" />-->
+    </TRestAxionMagneticField>
+    <TRestAxionSolarModel name="sunPrimakoff" verboseLevel="debug">
+        <!--<parameter name="mode" value="table"/>-->
+        <!--<parameter name="solarAxionModel" value="Primakoff_Gianotti_201904.dat"/>-->
+        <parameter name="solarAxionModel" value="arXiv_0702006_Primakoff"/>
+    </TRestAxionSolarModel>
+    <TRestAxionBufferGas name="helium" verboseLevel="warning">
+        <gas name="He" density="0.0025e-6"/>
+    </TRestAxionBufferGas>
+    <TRestAxionLikelihood name="babyIAXO">
+        <parameter name="Bmag" value="1.73T"/>
+        <parameter name="Rmag" value="35cm"/>
+        <parameter name="Lmag" value="10m"/>
+        <parameter name="efficiency" value="0.35*0.7"/>
+        <parameter name="bckLevel" value="1.e-7"/>
+        <parameter name="expTimeVacuum" value="1.5*365*12"/>
+        <!--<parameter name="expTimePerStep" value="1.5*365.*12./50."/>-->
+        <parameter name="expTimePerStep" value="-1"/>
+        <parameter name="pressureSteps" value="150"/>
+        <!-- Spot in cm2 -->
+        <parameter name="spotArea" value="0.3"/>
+        <!-- Helium density in g/cm3 -->
+        <parameter name="lastStepDensity" value="0.1789e-3"/>
+        <parameter name="energyRange" value="(1,8)"/>
+    </TRestAxionLikelihood>
+    <TRestAxionFieldPropagationProcess name="babyProp" value="ON" verboseLevel="info">
+        <parameter name="mode" value="plan"/>
+        <!-- plan or distance -->
+        <parameter name="distance" value="30000mm"/>
+        <parameter name="finalNPlan" value="(0,0,1)mm"/>
+        <parameter name="finalPositionPlan" value="(0,0,10000)mm"/>
+    </TRestAxionFieldPropagationProcess>
+</axion>
diff --git a/examples/opticsBench.rml → examples/optics/opticsBench.rml b/examples/opticsBench.rml → examples/optics/opticsBench.rml
diff --git a/examples/opticsBenchTrueW1.rml → examples/optics/opticsBenchTrueW1.rml b/examples/opticsBenchTrueW1.rml → examples/optics/opticsBenchTrueW1.rml
@@ -23,32 +23,25 @@
             <parameter name="couplingType" value="g_ag"/>
             <parameter name="couplingStrength" value="1.e-10"/>
             <parameter name="fluxDataFile" value="Primakoff_LennertHoof_202203.dat"/>
-            <parameter name="energyRange" value="(0.05, 10)keV" />
+            <parameter name="energyRange" value="(0.05, 10)keV"/>
             <parameter name="seed" value="137"/>
         </TRestAxionSolarFlux>
-
-	<TRestAxionXrayWindow name="siliconFoil" verboseLevel="info" thickness="0.3um" material="Si3N4" >
-        <TRestPatternMask name="mask" verboseLevel="warning" maskRadius="7mm" />
-    	</TRestAxionXrayWindow>
-
+        <TRestAxionXrayWindow name="siliconFoil" verboseLevel="info" thickness="0.3um" material="Si3N4">
+            <TRestPatternMask name="mask" verboseLevel="warning" maskRadius="7mm"/>
+        </TRestAxionXrayWindow>
         <TRestAxionXrayWindow name="strongBack" verboseLevel="warning">
-            <parameter name="windowType" value="stripped" />
-            <parameter name="thickness" value="200um" />
-            <parameter name="material" value="Si" />
-
-            <TRestStrippedMask name="mask" verboseLevel="warning" maskRadius="7mm" offset="(1.15,0)mm"
-                rotationAngle="0.5" stripsGap="2.3mm" stripsThickness="0.5mm" />
+            <parameter name="windowType" value="stripped"/>
+            <parameter name="thickness" value="200um"/>
+            <parameter name="material" value="Si"/>
+            <TRestStrippedMask name="mask" verboseLevel="warning" maskRadius="7mm" offset="(1.15,0)mm" rotationAngle="0.5" stripsGap="2.3mm" stripsThickness="0.5mm"/>
+        </TRestAxionXrayWindow>
+        <TRestAxionXrayWindow name="cathode" verboseLevel="info" thickness="0.02um" material="Al">
+            <TRestPatternMask name="mask" verboseLevel="warning" maskRadius="7mm"/>
         </TRestAxionXrayWindow>
-
-        <TRestAxionXrayWindow name="cathode" verboseLevel="info" thickness="0.02um" material="Al" >
-        <TRestPatternMask name="mask" verboseLevel="warning" maskRadius="7mm" />
-    	</TRestAxionXrayWindow>
-
         <TRestAxionXrayWindow name="magnetBore" material="Vacuum">
             <TRestPatternMask name="mask" maskRadius="16cm" verboseLevel="info"/>
         </TRestAxionXrayWindow>
-
-	<!-- Optics definition -->
+        <!-- Optics definition -->
         <TRestAxionTrueWolterOptics file="xmmTrueWolter.rml"/>
     </TRestRun>
     <TRestProcessRunner name="EventProcess" verboseLevel="info">
@@ -58,7 +51,7 @@
         <parameter name="inputEvent" value="off"/>
         <parameter name="outputEvent" value="on"/>
         <addProcess type="TRestAxionGeneratorProcess" name="axionGen" value="ON" verboseLevel="info">
-			<parameter name="generatorType" value="solarFlux" />
+            <parameter name="generatorType" value="solarFlux"/>
             <parameter name="energyRange" value="(0.03,10)keV"/>
             <parameter name="axionMass" value="5meV"/>
             <parameter name="targetRadius" value="40cm"/>
@@ -74,7 +67,6 @@
             <observable name="posX"/>
             <observable name="posY"/>
         </addProcess>
-
         <!-- Optics response -->
         <addProcess type="TRestAxionOpticsProcess" name="optics" veboseLevel="info">
             <parameter name="center" value="(0,0,0)"/>
@@ -92,20 +84,18 @@
             <observable name="posX"/>
             <observable name="posY"/>
         </addProcess>
-
         <!-- Moving to Z=7500 -->
         <addProcess type="TRestAxionTransportProcess" name="ToFocalPoint" zPosition="7500"/>
         <addProcess type="TRestAxionAnalysisProcess" name="focal">
             <observable name="posX"/>
             <observable name="posY"/>
-
         </addProcess>
-                <addProcess type="TRestAxionTransmissionProcess" name="window" veboseLevel="info" value="ON">
-			<parameter name="center" value="(0,0,7500)mm" />
-            		<observable name="transmission"/>
-            		<window name="siliconFoil" />
-			<window name="cathode" />
-			<window name="strongBack" />
+        <addProcess type="TRestAxionTransmissionProcess" name="window" veboseLevel="info" value="ON">
+            <parameter name="center" value="(0,0,7500)mm"/>
+            <observable name="transmission"/>
+            <window name="siliconFoil"/>
+            <window name="cathode"/>
+            <window name="strongBack"/>
         </addProcess>
     </TRestProcessRunner>
     <addTask command="EventProcess-&gt;RunProcess()" value="ON"/>

diff --git a/examples/opticsPlots.rml → examples/optics/opticsPlots.rml b/examples/opticsPlots.rml → examples/optics/opticsPlots.rml
diff --git a/examples/opticsPlotsAllTransm.rml → examples/optics/opticsPlotsAllTransm.rml b/examples/opticsPlotsAllTransm.rml → examples/optics/opticsPlotsAllTransm.rml
diff --git a/examples/test.C b/examples/test.C
diff --git a/images/axionFieldPlots.png b/images/axionFieldPlots.png