From 806a742b06dce5746855e48b4b641031bc4fbb15 Mon Sep 17 00:00:00 2001
From: Laurent Mercadier <laurent.mercadier@xfel.eu>
Date: Tue, 22 Oct 2019 15:52:10 +0200
Subject: [PATCH] Automatically finds semester and topic
---
DSSC.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/DSSC.py b/DSSC.py
index a571613..2d0b6a2 100644
--- a/DSSC.py
+++ b/DSSC.py
@@ -8,6 +8,7 @@ import warnings
import psutil
import karabo_data as kd
+from karabo_data.read_machinery import find_proposal
from karabo_data.geometry2 import DSSC_1MGeometry
import ToolBox as tb
import matplotlib.pyplot as plt
@@ -20,21 +21,22 @@ from imageio import imread
class DSSC:
- def __init__(self, semester, proposal, topic='SCS', distance=1):
+ def __init__(self, proposal, distance=1):
""" Create a DSSC object to process DSSC data.
inputs:
- semester: semester string
- proposal: proposal number string
- topic: topic, by default SCS
- distance: distance sample to DSSC detector in meter
+ proposal: (int,str) proposal number string
+ distance: (float) distance sample to DSSC detector in meter
"""
- self.semester = semester
+ if isinstance(proposal,int):
+ proposal = 'p{:06d}'.format(proposal)
+ runFolder = find_proposal(proposal)
+ self.semester = runFolder.split('/')[-2]
self.proposal = proposal
- self.topic = topic
+ self.topic = runFolder.split('/')[-3]
self.tempdir = None
- self.save_folder = f'/gpfs/exfel/exp/{self.topic}/{self.semester}/{self.proposal}/usr/condensed_runs/'
+ self.save_folder = os.path.join(runFolder, 'usr/condensed_runs/')
self.distance = distance
self.px_pitch_h = 236 # horizontal pitch in microns
self.px_pitch_v = 204 # vertical pitch in microns
--
GitLab