Skip to content

Commit

Permalink
P11Session code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Gruzinov committed Oct 1, 2024
1 parent 4ed9227 commit 7e33ea7
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions mxcubecore/HardwareObjects/DESY/P11Session.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
from datetime import date
from select import EPOLL_CLOEXEC
from mxcubecore.HardwareObjects.Session import Session
import warnings
from configparser import ConfigParser

PATH_BEAMTIME = "/gpfs/current"
Expand Down Expand Up @@ -235,19 +234,21 @@ def locate_metadata_file(self, root_dir="/gpfs"):
]
except OSError as e:
print(e)
warnings.warn("Root directory does not exist: " + str(root_dir))
self.log.debug("Root directory does not exist: " + str(root_dir))
return None # Fall back if the root directory doesn't exist.

print(f"Scanning directories: {beamtime_dirs}")
self.log.debug(f"Scanning directories: {beamtime_dirs}")

metadata_files = []
for curr_dir in beamtime_dirs + [root_dir]:
curr_dir_metadata_files = glob.glob("{0}/*metadata*.json".format(curr_dir))
metadata_files.extend(curr_dir_metadata_files)
print(f"Found metadata files in {curr_dir}: {curr_dir_metadata_files}")
self.log.debug(
f"Found metadata files in {curr_dir}: {curr_dir_metadata_files}"
)

if len(metadata_files) != 1:
warnings.warn(
self.log.debug(
"Unique metadata JSON file not found. Falling back to /gpfs/local."
)
return None # Return None to indicate no metadata file was found.
Expand Down

0 comments on commit 7e33ea7

Please sign in to comment.