diff --git a/eas/do_sims.sh b/eas/do_sims.sh
index d4873182978a143aa2460385bf6bb54f94087794..b7566c3eba0b4a83475f8de5440ead1627dae70b 100755
--- a/eas/do_sims.sh
+++ b/eas/do_sims.sh
@@ -194,11 +194,11 @@ while getopts 'w:k:p:t:v:u:h:s:j:c:b:m:n:r:i:o:q:a:?lydex' opt; do
;;
e)
cta=true
- echo -e "# Cherenkov mode enabled for = $site"
+ echo -e "# Cherenkov mode = $cta"
;;
y)
vol=true
- echo -e "# Volumetric detector mode for = $site"
+ echo -e "# Volumetric detector mode = $vol"
;;
l)
slurm=true
@@ -234,42 +234,42 @@ fi
if [ "X$tim" == "X" ]; then
tim=3600;
- echo -e "# WARNING: Time was not provided. Using default time: $tim s"
+ echo -e "# INFO: Time was not provided. Using default time: $tim s"
fi
if [ "X$procs" == "X0" ]; then
procs=4;
- echo -e "# WARNING: Processors should be >0, using default: $procs"
+ echo -e "# INFO: Processors should be >0, using default: $procs"
fi
if [ "X$ver" == "X" ]; then
ver="77402"
- echo -e "# WARNING: CORSIKA version was not provided. Using default: $ver"
+ echo -e "# INFO: CORSIKA version was not provided. Using default: $ver"
fi
if [ "X$hig" == "X" ]; then
hig="QGSII"
- echo -e "# WARNING: High energy interaction model was not provided. Using default: $hig"
+ echo -e "# INFO: High energy interaction model was not provided. Using default: $hig"
fi
if [ "X$atm_model" == "X" ]; then
atm_model="E1"
- echo -e "# WARNING: Atmospheric Model was not provided. Using default: $atm_model"
+ echo -e "# INFO: Atmospheric Model was not provided. Using default: $atm_model"
fi
if [ "X$rigididy" == "X" ]; then
rigididy="0"
- echo -e "# WARNING: Rigidity cutoff was not provided. Using default (disabled): $rigididy"
+ echo -e "# INFO: Rigidity cutoff was not provided. Using default (disabled): $rigididy"
fi
if [ "X$lowez" == "X" ]; then
lowez="0"
- echo -e "# WARNING: Low edge of zenith angle was not provided. Using default: $lowez"
+ echo -e "# INFO: Low edge of zenith angle was not provided. Using default: $lowez"
fi
if [ "X$highez" == "X" ]; then
highez="90"
- echo -e "# WARNING: High edge of zenith angle was not provided. Using default: $highez"
+ echo -e "# INFO: High edge of zenith angle was not provided. Using default: $highez"
fi
if [ "X$lowppe" == "X" ]; then
@@ -279,30 +279,30 @@ fi
if [ "X$upperppe" == "X" ]; then
upperppe="1e6"
- echo -e "# WARNING: Primary particle high energy limit was not provided. Using default: $upperppe"
+ echo -e "# INFO: Primary particle high energy limit was not provided. Using default: $upperppe"
fi
if [ "X$BX" == "X" ]; then
BX="12.5"
- echo -e "# WARNING: Horizontal comp. Earth's mag. field was not provided. Using default: $BX"
+ echo -e "# INFO: Horizontal comp. Earth's mag. field was not provided. Using default: $BX"
fi
if [ "X$BZ" == "X" ]; then
BZ="25.5"
- echo -e "# WARNING: Vertical comp. Earth's mag. field was not provided. Using default: $BZ"
+ echo -e "# INFO: Vertical comp. Earth's mag. field was not provided. Using default: $BZ"
fi
if $debug; then
- echo -e "# WARNING: You are running in DEBUG mode."
+ echo -e "# INFO: You are running in DEBUG mode."
fi
if $defaults; then
- echo -e "# WARNING: You are using some default vaules that will not be prompted."
+ echo -e "# INFO: You are using some default vaules that will not be prompted."
fi
if $cta; then
if $sites; then
- echo -e "# WARNING: Cherenkov mode is enabled."
+ echo -e "# INFO: Cherenkov mode is enabled."
else
echo; echo -e "ERROR: You have to provide a site location in CHERENKOV mode"
showhelp
@@ -311,16 +311,16 @@ if $cta; then
fi
if $highsec; then
- echo -e "# WARNING: High energy cuts of $ecut GeV for secondaries will be used."
+ echo -e "# INFO: High energy cuts of $ecut GeV for secondaries will be used."
if [ $lowppe -lt $ecut ]; then
lowppe=$ecut
lppe=true
- echo -e "# WARNING: Primary particle low energy limit is below energy cuts for secondaries. Changing to: $lowppe"
+ echo -e "# INFO: Primary particle low energy limit is below energy cuts for secondaries. Changing to: $lowppe"
fi
fi
if $slurm; then
- echo -e "# WARNING: SLURM mode is enable. Will not work in other environments."
+ echo -e "# INFO: SLURM mode is enable. Will not work in other environments."
fi
corsika_bin="corsika${ver}Linux_${hig}_gheisha"
diff --git a/eas/generate_spectra.pl b/eas/generate_spectra.pl
index 205d7a6fc5836e8e6fdeba5d3aed8aecdef5300c..7265c9dccb2fe32e0a69374ff1b91b6ea0fcc396 100755
--- a/eas/generate_spectra.pl
+++ b/eas/generate_spectra.pl
@@ -271,7 +271,7 @@ my $atmcrd = "ATMOSPHERE";
if ($site ne "unk") {
# first, read the jsonld and build the sites hash
- my $url = "https://lagoproject.github.io/DMP/defs/sitesLago.jsonld";
+ my $url = "https://lagoproject.github.io/DMP/defs/sitesLago.1.1.jsonld";
my $jsonld;
die "could not get $url\n" unless (defined($jsonld = get $url));
my $decoded = decode_json($jsonld);
@@ -291,6 +291,7 @@ if ($site ne "unk") {
$altitude = $sites{"$site"}[1];
$bx = $sites{"$site"}[2];
$bz = $sites{"$site"}[3];
+ print STDERR "INFO: $site parameters were obtained from the LAGO DMP\n";
} else {
if ($site eq "gen" || $site eq "air" || $site eq "unk") {
print STDERR "WARNING: $site is generic. Some defaults needs to be used\n";
diff --git a/eas/rain.pl b/eas/rain.pl
index a3858833d95b264ae555da031788d000bdcd6299..2dddc388077e2a15eb68257f9d0ee590b2227517 100755
--- a/eas/rain.pl
+++ b/eas/rain.pl
@@ -348,11 +348,12 @@ for (my $i=0; $i < $nofruns; $i++) {
my $bx = 0.;
my $bz = 0.;
my $arrang = 0.;
+ my $getjson = "";
if ($batch == 0) {
if ($site ne "unk") {
# first, read the jsonld and build the sites hash
- my $url = "https://lagoproject.github.io/DMP/defs/sitesLago.jsonld";
+ my $url = "https://lagoproject.github.io/DMP/defs/sitesLago.1.1.jsonld";
my $jsonld;
die "could not get $url\n" unless (defined($jsonld = get $url));
my $decoded = decode_json($jsonld);
@@ -372,6 +373,7 @@ for (my $i=0; $i < $nofruns; $i++) {
$altitude = $sites{"$site"}[1];
$bx = $sites{"$site"}[2];
$bz = $sites{"$site"}[3];
+ $getjson="parameters for site $site were obtained from DMP";
}
else {
if ($site eq "gen" || $site eq "air" || $site eq "unk") {
@@ -592,6 +594,7 @@ EXIT
unless ($grid != 0) {
print "###################################################################\n";
print "# Starting simulations $name\n";
+ print "# $getjson\n";
if ($slurm != 0) {
print "###################################################################\n";
$cmd="sbatch -p highpri2 -o ${name}_srun_%j.log ${script}";