diff --git a/bob/rppg/base/script/compute_performance.py b/bob/rppg/base/script/compute_performance.py index 687f926501b2f16894f0892486110f1f4bbcc228..b268692f456a28cb4ac6763183e61d946c7c5228 100644 --- a/bob/rppg/base/script/compute_performance.py +++ b/bob/rppg/base/script/compute_performance.py @@ -18,7 +18,7 @@ Options: -V, --version Show version -v, --verbose Increases the verbosity (may appear multiple times) -P, --plot Set this flag if you'd like to see some plots. - -p, --protocol=<string> Protocol. + -p, --protocol=<string> Protocol [default: all].[default: all] -s, --subset=<string> Data subset to load. If nothing is provided all the data sets will be loaded. -i, --hrdir=<path> The path to the saved heart rate values on your disk [default: hr]. @@ -48,7 +48,7 @@ logger = setup("bob.rppg.base") from docopt import docopt from bob.extension.config import load -from bob.rppg.base.utils import get_parameter +from ..utils import get_parameter version = pkg_resources.require('bob.rppg.base')[0].version @@ -71,8 +71,8 @@ def main(user_input=None): configuration = load([os.path.join(args['<configuration>'])]) # get various parameters, either from config file or command-line - protocol = get_parameter(args, configuration, 'protocol', 'None') - subset = get_parameter(args, configuration, 'subset', 'all') + protocol = get_parameter(args, configuration, 'protocol', 'all') + subset = get_parameter(args, configuration, 'subset', None) hrdir = get_parameter(args, configuration, 'hrdir', 'hr') resultdir = get_parameter(args, configuration, 'resultdir', 'results') overwrite = get_parameter(args, configuration, 'overwrite', False) diff --git a/bob/rppg/base/script/frequency_analysis.py b/bob/rppg/base/script/frequency_analysis.py index 7a3a619b7b4c8b7f937f82ad5b67f2607736d747..0b32c287a3200ba67dbf2fc8a8f178f87e747e15 100644 --- a/bob/rppg/base/script/frequency_analysis.py +++ b/bob/rppg/base/script/frequency_analysis.py @@ -20,7 +20,7 @@ Options: -V, --version Show version -P, --plot Set this flag if you'd like to follow-up the algorithm execution graphically. We'll plot some interactions. - -p, --protocol=<string> Protocol. + -p, --protocol=<string> Protocol [default: all].[default: all] -s, --subset=<string> Data subset to load. If nothing is provided all the data sets will be loaded. -i, --pulsedir=<path> The path to the saved filtered signals on your disk @@ -60,7 +60,7 @@ logger = setup("bob.rppg.base") from docopt import docopt from bob.extension.config import load -from bob.rppg.base.utils import get_parameter +from ..utils import get_parameter version = pkg_resources.require('bob.rppg.base')[0].version @@ -83,8 +83,8 @@ def main(user_input=None): configuration = load([os.path.join(args['<configuration>'])]) # get various parameters, either from config file or command-line - protocol = get_parameter(args, configuration, 'protocol', 'None') - subset = get_parameter(args, configuration, 'subset', 'all') + protocol = get_parameter(args, configuration, 'protocol', 'all') + subset = get_parameter(args, configuration, 'subset', None) pulsedir = get_parameter(args, configuration, 'pulsedir', 'pulse') hrdir = get_parameter(args, configuration, 'hrdir', 'hr') framerate = get_parameter(args, configuration, 'framerate', 61) diff --git a/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py b/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py index 261906c75172430baf54a5d5d9dd5fae8fed6de0..51f5d18c809e51008aa6db0a6377f0da811f86c3 100644 --- a/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py +++ b/bob/rppg/cvpr14/script/extract_face_and_bg_signals.py @@ -17,7 +17,7 @@ Usage: Options: -h, --help Show this screen -V, --version Show version - -p, --protocol=<string> Protocol. + -p, --protocol=<string> Protocol [default: all]. -s, --subset=<string> Data subset to load. If nothing is provided all the sets will be loaded. -f, --facedir=<path> The path to the directory where signal extracted @@ -63,6 +63,7 @@ logger = setup("bob.rppg.base") from docopt import docopt from bob.extension.config import load +from ...base.utils import get_parameter version = pkg_resources.require('bob.rppg.base')[0].version @@ -70,7 +71,6 @@ import numpy import bob.io.base import bob.ip.facedetect -from ...base.utils import get_parameter from ...base.utils import crop_face from ..extract_utils import kp66_to_mask @@ -96,10 +96,10 @@ def main(user_input=None): # load configuration file configuration = load([os.path.join(args['<configuration>'])]) - + # get various parameters, either from config file or command-line - protocol = get_parameter(args, configuration, 'protocol', 'None') - subset = get_parameter(args, configuration, 'subset', '') + protocol = get_parameter(args, configuration, 'protocol', 'all') + subset = get_parameter(args, configuration, 'subset', None) facedir = get_parameter(args, configuration, 'facedir', 'face') bgdir = get_parameter(args, configuration, 'bgdir', 'bg') npoints = get_parameter(args, configuration, 'npoints', 40) @@ -111,7 +111,7 @@ def main(user_input=None): gridcount = get_parameter(args, configuration, 'gridcount', False) wholeface = get_parameter(args, configuration, 'wholeface', False) verbosity_level = get_parameter(args, configuration, 'verbose', 0) - + # if the user wants more verbosity, lowers the logging level from bob.core.log import set_verbosity_level set_verbosity_level(logger, verbosity_level) diff --git a/bob/rppg/cvpr14/script/filter.py b/bob/rppg/cvpr14/script/filter.py index 2bcd7ccdd4af28d23001e55f25f6c2f0c630fd6d..1ff143d6bd524ed40949309e531e3bd8e2402ccd 100644 --- a/bob/rppg/cvpr14/script/filter.py +++ b/bob/rppg/cvpr14/script/filter.py @@ -20,7 +20,7 @@ Options: -V, --version Show version -P, --plot Set this flag if you'd like to follow-up the algorithm execution graphically. We'll plot some interactions. - -p, --protocol=<string> Protocol. + -p, --protocol=<string> Protocol [default: all]. -s, --subset=<string> Data subset to load. If nothing is provided all the data sets will be loaded. -i, --motiondir=<path> The path to the saved signals to be filtered on @@ -92,8 +92,8 @@ def main(user_input=None): configuration = load([os.path.join(args['<configuration>'])]) # get various parameters, either from config file or command-line - protocol = get_parameter(args, configuration, 'protocol', 'None') - subset = get_parameter(args, configuration, 'subset', '') + protocol = get_parameter(args, configuration, 'protocol', 'all') + subset = get_parameter(args, configuration, 'subset', None) motiondir = get_parameter(args, configuration, 'motiondir', 'motion') pulsedir = get_parameter(args, configuration, 'pulsedir', 'pulse') Lambda = get_parameter(args, configuration, 'Lambda', 300) diff --git a/bob/rppg/cvpr14/script/illumination_rectification.py b/bob/rppg/cvpr14/script/illumination_rectification.py index cecbe415919b403bdd69e09659f320358143e1f6..38049ce1cedc9258f051b1cec8cae9963de1609a 100644 --- a/bob/rppg/cvpr14/script/illumination_rectification.py +++ b/bob/rppg/cvpr14/script/illumination_rectification.py @@ -21,7 +21,7 @@ Options: -V, --version Show version -P, --plot Set this flag if you'd like to follow-up the algorithm execution graphically. We'll plot some interactions. - -p, --protocol=<string> Protocol. + -p, --protocol=<string> Protocol [default: all]. -s, --subset=<string> Data subset to load. If nothing is provided all the data sets will be loaded. -f, --facedir=<path> The path to the directory containing the average @@ -88,8 +88,8 @@ def main(user_input=None): configuration = load([os.path.join(args['<configuration>'])]) # get various parameters, either from config file or command-line - protocol = get_parameter(args, configuration, 'protocol', 'None') - subset = get_parameter(args, configuration, 'subset', 'all') + protocol = get_parameter(args, configuration, 'protocol', 'all') + subset = get_parameter(args, configuration, 'subset', None) facedir = get_parameter(args, configuration, 'facedir', 'face') bgdir = get_parameter(args, configuration, 'bgdir', 'bg') illumdir = get_parameter(args, configuration, 'illumdir', 'illumination') diff --git a/bob/rppg/cvpr14/script/motion_elimination.py b/bob/rppg/cvpr14/script/motion_elimination.py index 800af75f511b4c977e068f953e117f9ee65f11e4..5e2f938a27f7621bccf71a2691970beb8a6c4765 100644 --- a/bob/rppg/cvpr14/script/motion_elimination.py +++ b/bob/rppg/cvpr14/script/motion_elimination.py @@ -20,7 +20,7 @@ Options: -V, --version Show version -P, --plot Set this flag if you'd like to follow-up the algorithm execution graphically. We'll plot some interactions. - -p, --protocol=<string> Protocol. + -p, --protocol=<string> Protocol [default: all]. -s, --subset=<string> Data subset to load. If nothing is provided all the data sets will be loaded. -i, --illumdir=<path> The path to the saved illumination corrected signal @@ -91,8 +91,8 @@ def main(user_input=None): configuration = load([os.path.join(args['<configuration>'])]) # get various parameters, either from config file or command-line - protocol = get_parameter(args, configuration, 'protocol', 'None') - subset = get_parameter(args, configuration, 'subset', 'all') + protocol = get_parameter(args, configuration, 'protocol', 'all') + subset = get_parameter(args, configuration, 'subset', None) illumdir = get_parameter(args, configuration, 'illumdir', 'illumination') motiondir = get_parameter(args, configuration, 'motiondir', 'motion') seglength = get_parameter(args, configuration, 'seglength', 61)