tchange order of spallation and muon production rates - cosmo - front and backend for Markov-Chain Monte Carlo inversion of cosmogenic nuclide concentrations
(HTM) git clone git://src.adamsgaard.dk/cosmo
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 11e9efa15f31847d5dd24a7e9ce0960ef6ff36bb
(DIR) parent a93f27d9ebd13f7d8566ba0d712dfb453feda10d
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 18 Nov 2015 13:56:40 +0100
change order of spallation and muon production rates
Diffstat:
M matlab/file_scanner_mcmc_starter.m | 4 ++--
M matlab/import_php_file.m | 28 ++++++++++++++--------------
M matlab/mcmc_inversion.m | 6 +++++-
M pages/history.html | 36 ++++++++++++++++----------------
M uploadhistory.php | 8 ++++----
5 files changed, 43 insertions(+), 39 deletions(-)
---
(DIR) diff --git a/matlab/file_scanner_mcmc_starter.m b/matlab/file_scanner_mcmc_starter.m
t@@ -80,8 +80,8 @@ while 1
be_conc, al_conc, c_conc, ne_conc, ...
be_uncer, al_uncer, c_uncer, ne_uncer, ...
be_zobs, al_zobs, c_zobs, ne_zobs, ...
- be_prod_muons, al_prod_muons, c_prod_muons, ne_prod_muons, ...
be_prod_spall, al_prod_spall, c_prod_spall, ne_prod_spall, ...
+ be_prod_muons, al_prod_muons, c_prod_muons, ne_prod_muons, ...
rock_density, ...
epsilon_gla_min, epsilon_gla_max, ...
epsilon_int_min, epsilon_int_max, ...
t@@ -97,8 +97,8 @@ while 1
be_conc, al_conc, c_conc, ne_conc, ...
be_uncer, al_uncer, c_uncer, ne_uncer, ...
be_zobs, al_zobs, c_zobs, ne_zobs, ...
- be_prod_muons, al_prod_muons, c_prod_muons, ne_prod_muons, ...
be_prod_spall, al_prod_spall, c_prod_spall, ne_prod_spall, ...
+ be_prod_muons, al_prod_muons, c_prod_muons, ne_prod_muons, ...
rock_density, ...
epsilon_gla_min, epsilon_gla_max, ...
epsilon_int_min, epsilon_int_max, ...
(DIR) diff --git a/matlab/import_php_file.m b/matlab/import_php_file.m
t@@ -3,8 +3,8 @@ function [sample_id, name, email, ...
be_conc, al_conc, c_conc, ne_conc, ...
be_uncer, al_uncer, c_uncer, ne_uncer, ...
be_zobs, al_zobs, c_zobs, ne_zobs, ...
- be_prod_muon, al_prod_muon, c_prod_muon, ne_prod_muon, ...
be_prod_spall, al_prod_spall, c_prod_spall, ne_prod_spall, ...
+ be_prod_muon, al_prod_muon, c_prod_muon, ne_prod_muon, ...
rock_density, ...
epsilon_gla_min, epsilon_gla_max, ...
epsilon_int_min, epsilon_int_max, ...
t@@ -141,14 +141,14 @@ be_zobs = cell2mat(rawNumericColumns(:, 9)); % 14
al_zobs = cell2mat(rawNumericColumns(:, 10)); % 15
c_zobs = cell2mat(rawNumericColumns(:, 11)); % 16
ne_zobs = cell2mat(rawNumericColumns(:, 12)); % 17
-be_prod_muon = cell2mat(rawNumericColumns(:, 13)); % 18
-al_prod_muon = cell2mat(rawNumericColumns(:, 14)); % 19
-c_prod_muon = cell2mat(rawNumericColumns(:, 15)); % 20
-ne_prod_muon = cell2mat(rawNumericColumns(:, 16)); % 21
-be_prod_spall = cell2mat(rawNumericColumns(:, 17)); % 22
-al_prod_spall = cell2mat(rawNumericColumns(:, 18)); % 23
-c_prod_spall = cell2mat(rawNumericColumns(:, 19)); % 24
-ne_prod_spall = cell2mat(rawNumericColumns(:, 20)); % 25
+be_prod_spall = cell2mat(rawNumericColumns(:, 17)); % 18
+al_prod_spall = cell2mat(rawNumericColumns(:, 18)); % 19
+c_prod_spall = cell2mat(rawNumericColumns(:, 19)); % 20
+ne_prod_spall = cell2mat(rawNumericColumns(:, 20)); % 21
+be_prod_muon = cell2mat(rawNumericColumns(:, 13)); % 22
+al_prod_muon = cell2mat(rawNumericColumns(:, 14)); % 23
+c_prod_muon = cell2mat(rawNumericColumns(:, 15)); % 24
+ne_prod_muon = cell2mat(rawNumericColumns(:, 16)); % 25
rock_density = cell2mat(rawNumericColumns(:, 21)); % 26
epsilon_gla_min = cell2mat(rawNumericColumns(:, 22)); % 27
epsilon_gla_max = cell2mat(rawNumericColumns(:, 23)); % 28
t@@ -168,16 +168,16 @@ al_conc = al_conc*1000.; % atoms/g to atoms/kg
c_conc = c_conc*1000.; % atoms/g to atoms/kg
ne_conc = ne_conc*1000.; % atoms/g to atoms/kg
-be_prod_muon = be_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
-al_prod_muon = al_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
-c_prod_muon = c_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
-ne_prod_muon = ne_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
-
be_prod_spall = be_prod_spall*1000.; % atoms/g/yr to atoms/kg/yr
al_prod_spall = al_prod_spall*1000.; % atoms/g/yr to atoms/kg/yr
c_prod_spall = c_prod_spall*1000.; % atoms/g/yr to atoms/kg/yr
ne_prod_spall = ne_prod_spall*1000.; % atoms/g/yr to atoms/kg/yr
+be_prod_muon = be_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
+al_prod_muon = al_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
+c_prod_muon = c_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
+ne_prod_muon = ne_prod_muon*1000.; % atoms/g/yr to atoms/kg/yr
+
epsilon_gla_min = epsilon_gla_min/1000.; % m/Myr to mm/yr
epsilon_gla_max = epsilon_gla_max/1000.; % m/Myr to mm/yr
epsilon_int_min = epsilon_int_min/1000.; % m/Myr to mm/yr
(DIR) diff --git a/matlab/mcmc_inversion.m b/matlab/mcmc_inversion.m
t@@ -3,8 +3,8 @@ function [Ss, save_file] = mcmc_inversion(matlab_scripts_folder, debug, ...
be_conc, al_conc, c_conc, ne_conc, ...
be_uncer, al_uncer, c_uncer, ne_uncer, ...
be_zobs, al_zobs, c_zobs, ne_zobs, ...
- be_prod_muons, al_prod_muons, c_prod_muons, ne_prod_muons, ...
be_prod_spall, al_prod_spall, c_prod_spall, ne_prod_spall, ...
+ be_prod_muons, al_prod_muons, c_prod_muons, ne_prod_muons, ...
rock_density, ...
epsilon_gla_min, epsilon_gla_max, ...
epsilon_int_min, epsilon_int_max, ...
t@@ -24,8 +24,12 @@ format compact;
%Set path so that we can find other required m-files
addpath(matlab_scripts_folder)
+% save density for later use in subfunctions
fs.rho = rock_density;
+% save production rates for later use in subfunctions
+fs.be_prod_spall
+
fs.g_case = 'CosmoLongsteps'; %must match a case in function gz = linspace(0,10,100);
switch fs.g_case
(DIR) diff --git a/pages/history.html b/pages/history.html
t@@ -204,7 +204,7 @@
</div>
<div class="row">
- <b>TCN production rates (muons) [atoms/g/yr]
+ <b>TCN production rates (spallation) [atoms/g/yr]
</b> <br>
For each TCN concentration inserted above, please specify
the production rate.
t@@ -212,29 +212,29 @@
href="http://hess.ess.washington.edu"
target="_blank">CRONUS-Earth</a>.<br>
<div class="input-field col s3">
- <input id="be_prod_muons" name="be_prod_muons"
+ <input id="be_prod_spall" name="be_prod_spall"
type="text" class="validate">
- <label for="be_prod_muons" class="active"><sup>10</sup>Be</label>
+ <label for="be_prod_spall" class="active"><sup>10</sup>Be</label>
</div>
<div class="input-field col s3">
- <input id="al_prod_muons" name="al_prod_muons"
+ <input id="al_prod_spall" name="al_prod_spall"
type="text" class="validate">
- <label for="al_prod_muons" class="active"><sup>26</sup>Al</label>
+ <label for="al_prod_spall" class="active"><sup>26</sup>Al</label>
</div>
<div class="input-field col s3">
- <input id="c_prod_muons" name="c_prod_muons"
+ <input id="c_prod_spall" name="c_prod_spall"
type="text" class="validate">
- <label for="c_prod_muons" class="active"><sup>14</sup>C</label>
+ <label for="c_prod_spall" class="active"><sup>14</sup>C</label>
</div>
<div class="input-field col s3">
- <input id="ne_prod_muons" name="ne_prod_muons"
+ <input id="ne_prod_spall" name="ne_prod_spall"
type="text" class="validate">
- <label for="ne_prod_muons" class="active"><sup>21</sup>Ne</label>
+ <label for="ne_prod_spall" class="active"><sup>21</sup>Ne</label>
</div>
</div>
<div class="row">
- <b>TCN production rates (spallation) [atoms/g/yr]
+ <b>TCN production rates (muons) [atoms/g/yr]
</b> <br>
For each TCN concentration inserted above, please specify
the production rate.
t@@ -242,24 +242,24 @@
href="http://hess.ess.washington.edu"
target="_blank">CRONUS-Earth</a>.<br>
<div class="input-field col s3">
- <input id="be_prod_spall" name="be_prod_spall"
+ <input id="be_prod_muons" name="be_prod_muons"
type="text" class="validate">
- <label for="be_prod_spall" class="active"><sup>10</sup>Be</label>
+ <label for="be_prod_muons" class="active"><sup>10</sup>Be</label>
</div>
<div class="input-field col s3">
- <input id="al_prod_spall" name="al_prod_spall"
+ <input id="al_prod_muons" name="al_prod_muons"
type="text" class="validate">
- <label for="al_prod_spall" class="active"><sup>26</sup>Al</label>
+ <label for="al_prod_muons" class="active"><sup>26</sup>Al</label>
</div>
<div class="input-field col s3">
- <input id="c_prod_spall" name="c_prod_spall"
+ <input id="c_prod_muons" name="c_prod_muons"
type="text" class="validate">
- <label for="c_prod_spall" class="active"><sup>14</sup>C</label>
+ <label for="c_prod_muons" class="active"><sup>14</sup>C</label>
</div>
<div class="input-field col s3">
- <input id="ne_prod_spall" name="ne_prod_spall"
+ <input id="ne_prod_muons" name="ne_prod_muons"
type="text" class="validate">
- <label for="ne_prod_spall" class="active"><sup>21</sup>Ne</label>
+ <label for="ne_prod_muons" class="active"><sup>21</sup>Ne</label>
</div>
</div>
(DIR) diff --git a/uploadhistory.php b/uploadhistory.php
t@@ -189,14 +189,14 @@ $fieldnames = array(
'al_zobs',
'c_zobs',
'ne_zobs',
- 'be_prod_muons',
- 'al_prod_muons',
- 'c_prod_muons',
- 'ne_prod_muons',
'be_prod_spall',
'al_prod_spall',
'c_prod_spall',
'ne_prod_spall',
+ 'be_prod_muons',
+ 'al_prod_muons',
+ 'c_prod_muons',
+ 'ne_prod_muons',
'rock_density',
'epsilon_gla_min',
'epsilon_gla_max',