Merge branch 'main' of https://github.com/PNNL-CompBio/srpAnalytics

PNNL-CompBio · Oct 29, 2024 · be62ef7 · be62ef7
2 parents 6da8221 + e1cc6f2
commit be62ef7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -35,6 +35,7 @@ jobs:
         with:
          file: sampleChemMapping/Dockerfile
          tags: sgosline/srp-samplechem:latest
+         platforms: linux/amd64,linux/arm64
          push: true
 
   build-push-expo:
@@ -53,6 +54,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
          file: exposome/Dockerfile
+         platforms: linux/amd64,linux/arm64
          tags: sgosline/srp-exposome:latest
          push: true
 
@@ -73,6 +75,7 @@ jobs:
         with:
          file: zfExp/Dockerfile
          push: true
+         platforms: linux/amd64,linux/arm64
          tags: sgosline/srp-zfexp
 #      - name: Build and push bmd
 #        uses: docker/build-push-action@v6

diff --git a/data/fses/fses_data_for_pnnl_4-27-2021.csv b/data/fses/fses_data_for_pnnl_4-27-2021.csv
@@ -1,4 +1,4 @@
-SampleNumber,date_sampled,sample_matrix,technology,Sample_ID,zf_lims_id,cas_number,ClientName,SampleName,LocationLat,LocationLon,LocationName,LocationAlternateDescription,AlternateName,Chemical_ID,measurement_value,measurement_value_qualifier,measurement_value_unit,measurement_value_molar,measurement_value_molar_unit,water_concentration,water_concentration_qualifier,water_concentration_unit,water_concentration_molar,water_concentration_molar_unit,parentSampleNumber,childSampleNumber,projectName,date_sample_start,projectLink
+SampleNumber,date_sampled,sample_matrix,technology,Sample_ID,zf_lims_id,cas_number,ClientName,SampleName,LocationLat,LocationLon,LocationName,LocationAlternateDescription,AlternateName,Chemical_ID,measurement_value,measurement_value_qualifier,measurement_value_unit,measurement_value_molar,measurement_value_molar_unit,environment_concentration,environment_concentration_qualifier,environment_concentration_unit,environment_concentration_molar,environment_concentration_molar_unit,parentSampleNumber,childSampleNumber,projectName,date_sample_start,projectLink
 10AUG09-01-003,8/5/10 19:30,PSD-Water,LFT - Spiked,NULL,10AUG09-01-011,120-12-7,NULL,AL-LFT-W-SPK,30.25469,-87.81307,"Gulf Shores, Alabama",NULL,"Bon Secour, AL",0,415,NULL,pg/uL,2328.46,pmol/mL,0.565,NULL,ng/L,0.00317008,nmol/L,NULL,NULL,NA,NA,NA
 10AUG09-01-003,8/5/10 19:30,PSD-Water,LFT - Spiked,NULL,10AUG09-01-011,129-00-0,NULL,AL-LFT-W-SPK,30.25469,-87.81307,"Gulf Shores, Alabama",NULL,"Bon Secour, AL",0,3070,NULL,pg/uL,15179.2,pmol/mL,1.98,NULL,ng/L,0.00978983,nmol/L,NULL,NULL,NA,NA,NA
 10AUG09-01-003,8/5/10 19:30,PSD-Water,LFT - Spiked,NULL,10AUG09-01-011,132-65-0,NULL,AL-LFT-W-SPK,30.25469,-87.81307,"Gulf Shores, Alabama",NULL,"Bon Secour, AL",0,171,NULL,pg/uL,928.052,pmol/mL,0.262,NULL,ng/L,0.00142193,nmol/L,NULL,NULL,NA,NA,NA
@@ -4926,4 +4926,4 @@ None,None,None,None,NULL,NA,84-74-2,NA,NA,NULL,NULL,NA,NA,NA,NULL,NULL,NA,NA,NA,
 None,None,None,None,NULL,NA,85-01-8,NA,NA,NULL,NULL,NA,NA,NA,2635,0,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
 None,None,None,None,NULL,NA,86-73-7,NA,NA,NULL,NULL,NA,NA,NA,1855,0,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
 None,None,None,None,NULL,NA,91-20-3,NA,NA,NULL,NULL,NA,NA,NA,2323,0,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
-None,None,None,None,NULL,NA,91-57-6,NA,NA,NULL,NULL,NA,NA,NA,409,0,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
+None,None,None,None,NULL,NA,91-57-6,NA,NA,NULL,NULL,NA,NA,NA,409,0,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA