diff --git a/batch_preverify_stack_files_after_freezing.m b/batch_verify_mj2_files_after_freezing.m similarity index 94% rename from batch_preverify_stack_files_after_freezing.m rename to batch_verify_mj2_files_after_freezing.m index 427966b..3009d8a 100644 --- a/batch_preverify_stack_files_after_freezing.m +++ b/batch_verify_mj2_files_after_freezing.m @@ -11,7 +11,7 @@ function batch_preverify_stack_files_after_freezing(mj2_folder_name, ... bsub_options = '-P mouselight -W 59 -J verify-frozen' ; find_and_batch(tif_folder_name, ... @does_need_preverification_after_freezing, ... - @preverify_single_tif_file_after_mj2_from_tif, ... + @verify_single_mj2_file_after_freezing, ... 'do_submit', do_submit, ... 'do_try', do_try, ... 'submit_host_name', submit_host_name, ... diff --git a/verify_tif_files_after_mj2_from_tif.m b/check_certs_after_verifying_freezing.m similarity index 87% rename from verify_tif_files_after_mj2_from_tif.m rename to check_certs_after_verifying_freezing.m index 992fe2b..f4afad8 100644 --- a/verify_tif_files_after_mj2_from_tif.m +++ b/check_certs_after_verifying_freezing.m @@ -1,4 +1,4 @@ -function verify_tif_files_after_mj2_from_tif(tif_root_folder_path, mj2_root_folder_path) +function check_certs_after_verifying_freezing(tif_root_folder_path, mj2_root_folder_path) % Makes sure there's a .similar-mj2-exists for each .tif file in % tif_root_folder_path. diff --git a/freeze_mouselight_folder.m b/freeze_mouselight_folder.m index 30bed72..4a737cb 100644 --- a/freeze_mouselight_folder.m +++ b/freeze_mouselight_folder.m @@ -42,14 +42,14 @@ function freeze_mouselight_folder(... if do_verification , % Use the cluster to check that all compressed .tif's match their .mj2 well % enough, and write a 'certificate' file to represent that. - fprintf('Doing batch preverification of .tif files...\n') ; - batch_preverify_stack_files_after_freezing(mj2_output_folder_path, ... - tif_input_folder_path, ... - do_run_on_cluster, ... - do_try, ... - submit_host_name, ... - maximum_running_slot_count) - fprintf('Done with batch preverification of .tif files.\n') ; + fprintf('Doing batch verification of .tif files...\n') ; + batch_verify_mj2_files_after_freezing(mj2_output_folder_path, ... + tif_input_folder_path, ... + do_run_on_cluster, ... + do_try, ... + submit_host_name, ... + maximum_running_slot_count) + fprintf('Done with batch verification of .tif files.\n') ; % Wait a bit to make sure the filesystem changes have propagated if do_run_on_cluster , @@ -57,9 +57,9 @@ function freeze_mouselight_folder(... end % Check that all the cetificate files that should be there, are there - fprintf('Doing verification of .tif files...\n') ; - verify_tif_files_after_mj2_from_tif(tif_input_folder_path, mj2_output_folder_path) ; - fprintf('Done with verification of .tif files.\n') ; + fprintf('Checking output .mj2 verification certificates...\n') ; + check_certs_after_verifying_freezing(tif_input_folder_path, mj2_output_folder_path) ; + fprintf('Done with checking output .mj2 verification certificates.\n') ; % Verify that all the non-tif files exist on the mj2 side fprintf('Doing verification of non-.tif files...\n') ; diff --git a/preverify_single_tif_file_after_mj2_from_tif.m b/verify_single_mj2_file_after_freezing.m similarity index 92% rename from preverify_single_tif_file_after_mj2_from_tif.m rename to verify_single_mj2_file_after_freezing.m index aa53d1f..ef977c6 100644 --- a/preverify_single_tif_file_after_mj2_from_tif.m +++ b/verify_single_mj2_file_after_freezing.m @@ -1,4 +1,4 @@ -function preverify_single_tif_file_after_mj2_from_tif(tif_file_path, tif_root_folder_name, mj2_root_folder_name) +function verify_single_mj2_file_after_freezing(tif_file_path, tif_root_folder_name, mj2_root_folder_name) % Checks that the mj2 is similar to the .tif, and outputs a .similar-mj2-exists file in the % tif folder if they are similar. If unable to verify, writes nothing. relative_file_path_of_tif = relpath(tif_file_path, tif_root_folder_name) ;