diff --git a/_modules/icefit/peakfit.html b/_modules/icefit/peakfit.html index 26767c70..f74f615b 100644 --- a/_modules/icefit/peakfit.html +++ b/_modules/icefit/peakfit.html @@ -515,9 +515,9 @@
# Tag & Probe efficiency (and scale factor) estimation.
# Multiprocessing via Ray.
-#
+#
# Notes:
-#
+#
# - Keep all pdf functions normalized in the steering yml normalized,
# otherwise not consistent (norm: True)
#
@@ -553,9 +553,10 @@ Source code for icefit.peakfit
import ray
-__VERSION__ = 0.05
+__VERSION__ = 0.06
__AUTHOR__ = 'm.mieskolainen@imperial.ac.uk'
+
# ========================================================================
# Input processing
@@ -1213,12 +1214,15 @@ Source code for icefit.peakfit
parser.add_argument('--inputfile', type=str, default='configs/peakfit/tune2.yml', help="Steering input YAML file", nargs='?')
# Override (optional)
- parser.add_argument('--input_path', type=str, default=None, help="Input path", nargs='?')
- parser.add_argument('--output_name', type=str, default=None, help="Output name", nargs='?')
- parser.add_argument('--fit_type', type=str, default=None, help="Fit type", nargs='?')
- parser.add_argument('--num_cpus', type=int, default=None, help="Number of CPUs", nargs='?')
- parser.add_argument('--rng_seed', type=int, default=None, help="Random seed", nargs='?')
- parser.add_argument('--loss_type', type=str, default=None, help="Loss type", nargs='?')
+ parser.add_argument('--input_path', type=str, default=None, help="Input path", nargs='?')
+ parser.add_argument('--output_name', type=str, default=None, help="Output name", nargs='?')
+ parser.add_argument('--fit_type', type=str, default=None, help="Fit type", nargs='?')
+ parser.add_argument('--num_cpus', type=int, default=None, help="Number of CPUs (0 for automatic)", nargs='?')
+ parser.add_argument('--rng_seed', type=int, default=None, help="Random seed", nargs='?')
+ parser.add_argument('--loss_type', type=str, default=None, help="Loss type", nargs='?')
+ parser.add_argument('--trials', type=int, default=None, help="Trials", nargs='?')
+
+ parser.add_argument('--draw_mnmatrix', help="Draw 2D MINOS profiles", action="store_true")
args = parser.parse_args()
print(args)
@@ -1250,8 +1254,14 @@ Source code for icefit.peakfit
if args.loss_type is not None:
p['techno']['loss_type'] = args.loss_type
- # -------------------------------------------------
+ if args.trials is not None:
+ p['techno']['trials'] = args.trials
+
+ if args.draw_mnmatrix:
+ p['techno']['draw_mnmatrix'] = True
+ # -------------------------------------------------
+
print('-----------------------------')
cprint(f'peakfit {__VERSION__} ({__AUTHOR__})', 'magenta')
print('')
diff --git a/objects.inv b/objects.inv
index 5ffbdd1e..a0029d30 100644
Binary files a/objects.inv and b/objects.inv differ