From 0567046b2786e04b3313fc03bbc745968ae1e09e Mon Sep 17 00:00:00 2001 From: Ewoud Date: Sun, 28 Oct 2018 17:18:13 +0100 Subject: [PATCH 1/2] Add example for the chifit (to be made still) --- examples/huispulsar_chifit/chifitparam.yml | 24 ++++++++++++++++++++++ examples/huispulsar_chifit/getData.sh | 4 ++++ examples/huispulsar_chifit/run.sh | 13 ++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 examples/huispulsar_chifit/chifitparam.yml create mode 100755 examples/huispulsar_chifit/getData.sh create mode 100755 examples/huispulsar_chifit/run.sh diff --git a/examples/huispulsar_chifit/chifitparam.yml b/examples/huispulsar_chifit/chifitparam.yml new file mode 100644 index 0000000..342e6fd --- /dev/null +++ b/examples/huispulsar_chifit/chifitparam.yml @@ -0,0 +1,24 @@ +# Information about the data file +Observation: + FileName: 'B0329+54_10-04-2018.fits.gz' + RawData: 0 # 1 for raw data, 0 for data with info + +# Folding parameters +Folding: + nbins: 500 # Number of bins for folding + nbinsdedisp: 500 # Number of bins for dedispersed profile + +# Output parameters +Output: + OutputDir: './output' + ConvertRaw: 1 # if raw convert to fits + +# Chifit parameters +ChiFit: + Plow: 0.70 # lower bound period + Phigh: 0.75 # higher bound period + Ntries: 1000 # Ntries + FitFunc: 'Lorentzian' # Fit function Lorentzian or a absolute exponential + + + diff --git a/examples/huispulsar_chifit/getData.sh b/examples/huispulsar_chifit/getData.sh new file mode 100755 index 0000000..6175e6c --- /dev/null +++ b/examples/huispulsar_chifit/getData.sh @@ -0,0 +1,4 @@ +#!/bin/bash +wget www.astro.rug.nl/~camras/data/obs-10-04-2018/B0329+54_10-04-2018.fits.gz + + diff --git a/examples/huispulsar_chifit/run.sh b/examples/huispulsar_chifit/run.sh new file mode 100755 index 0000000..009c399 --- /dev/null +++ b/examples/huispulsar_chifit/run.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# Download the observation data if it is not present +if [ ! -e B0329+54_10-04-2018.fits.gz ] +then + echo "Dowloading the observation data" + ./getData.sh +fi + +# Run PSF +echo "Run PSF" +../../main.py huispulsarParam.yml + From 04cad3cc976e3851a2ce169e2b8a88f1333c5a32 Mon Sep 17 00:00:00 2001 From: Ewoud Date: Sun, 28 Oct 2018 17:19:27 +0100 Subject: [PATCH 2/2] Update the chifit example for new syntax + run with a module system --- examples/huispulsar_chifit/chifitparam.yml | 24 ++++++++++------------ examples/huispulsar_chifit/run.sh | 7 +++++-- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/huispulsar_chifit/chifitparam.yml b/examples/huispulsar_chifit/chifitparam.yml index 342e6fd..8fca7e1 100644 --- a/examples/huispulsar_chifit/chifitparam.yml +++ b/examples/huispulsar_chifit/chifitparam.yml @@ -1,7 +1,6 @@ -# Information about the data file -Observation: - FileName: 'B0329+54_10-04-2018.fits.gz' - RawData: 0 # 1 for raw data, 0 for data with info +# Information about the data file + +FileName: 'B0329+54_10-04-2018.fits.gz' # Folding parameters Folding: @@ -11,14 +10,13 @@ Folding: # Output parameters Output: OutputDir: './output' - ConvertRaw: 1 # if raw convert to fits - -# Chifit parameters -ChiFit: - Plow: 0.70 # lower bound period - Phigh: 0.75 # higher bound period - Ntries: 1000 # Ntries - FitFunc: 'Lorentzian' # Fit function Lorentzian or a absolute exponential - + SavePlots: true +ChiFit: + Ntries: 1000 + nbins_time: 1000 + nbins_freq: 1000 + trywidth: 1e-3 + FitFunc: 'Lorentzian' +GrasMaaier: {} diff --git a/examples/huispulsar_chifit/run.sh b/examples/huispulsar_chifit/run.sh index 009c399..a43074a 100755 --- a/examples/huispulsar_chifit/run.sh +++ b/examples/huispulsar_chifit/run.sh @@ -9,5 +9,8 @@ fi # Run PSF echo "Run PSF" -../../main.py huispulsarParam.yml - +if command -v python3 &>/dev/null; then + python3 ../../main.py huispulsarParam.yml +else + python ../../main.py huispulsarParam.yml +fi