sardana-nxsrecorder 3.26.1__py3-none-any.whl → 3.27.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. {sardana_nxsrecorder-3.26.1.dist-info → sardana_nxsrecorder-3.27.0.dist-info}/METADATA +1 -1
  2. sardana_nxsrecorder-3.27.0.dist-info/RECORD +6 -0
  3. sardananxsrecorder/__init__.py +1 -1
  4. sardananxsrecorder/nxsrecorder.py +4 -0
  5. sardana_nxsrecorder-3.26.1.dist-info/RECORD +0 -6
  6. {sardana_nxsrecorder-3.26.1.dist-info → sardana_nxsrecorder-3.27.0.dist-info}/WHEEL +0 -0
  7. {sardana_nxsrecorder-3.26.1.dist-info → sardana_nxsrecorder-3.27.0.dist-info}/top_level.txt +0 -0
{sardana_nxsrecorder-3.26.1.dist-info → sardana_nxsrecorder-3.27.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sardana-nxsrecorder
3
- Version: 3.26.1
3
+ Version: 3.27.0
4
4
  Summary: NeXus Sardana Scan Recorder
5
5
  Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
6
6
  Author: Jan Kotanski
sardana_nxsrecorder-3.27.0.dist-info/RECORD ADDED
@@ -0,0 +1,6 @@
1
+ sardananxsrecorder/__init__.py,sha256=OJHfgiQR7I36ICO3Lvh9KKyHE4H2vU8b4Gu_sTyR6V0,896
2
+ sardananxsrecorder/nxsrecorder.py,sha256=nT6o1p6F7rNUR1VJ-omEFznpgbQ3XC90w9axV9GPRXE,58593
3
+ sardana_nxsrecorder-3.27.0.dist-info/METADATA,sha256=WWIN6OtKX_CQpshvyk4rDksMBwpLj1nMXWyZUi39c5o,8035
4
+ sardana_nxsrecorder-3.27.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
5
+ sardana_nxsrecorder-3.27.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
6
+ sardana_nxsrecorder-3.27.0.dist-info/RECORD,,
sardananxsrecorder/__init__.py CHANGED
@@ -20,4 +20,4 @@
20
20
  """ Sardana Scan Recorders """
21
21
 
22
22
  #: package version
23
- __version__ = "3.26.1"
23
+ __version__ = "3.27.0"
sardananxsrecorder/nxsrecorder.py CHANGED
@@ -1345,6 +1345,8 @@ class NXS_FileRecorder(BaseFileRecorder):
1345
1345
 
1346
1346
  sid = self.__serial
1347
1347
  fdir, fname = os.path.split(self.filename)
1348
+ if bool(self.__getEnvVar("ScanFileInScanNameDir", False)):
1349
+ fdir = os.path.dirname(os.path.abspath(fdir))
1348
1350
  sname, fext = os.path.splitext(fname)
1349
1351
  beamtimeid = self.beamtimeid()
1350
1352
  defprefix = "scicat-datasets-"
@@ -1416,6 +1418,8 @@ class NXS_FileRecorder(BaseFileRecorder):
1416
1418
 
1417
1419
  sid = self.__serial
1418
1420
  fdir, fname = os.path.split(self.filename)
1421
+ if bool(self.__getEnvVar("ScanFileInScanNameDir", False)):
1422
+ fdir = os.path.dirname(os.path.abspath(fdir))
1419
1423
  sname, fext = os.path.splitext(fname)
1420
1424
  # beamtimeid = self.beamtimeid()
1421
1425
 
sardana_nxsrecorder-3.26.1.dist-info/RECORD DELETED
@@ -1,6 +0,0 @@
1
- sardananxsrecorder/__init__.py,sha256=D9XnMblVPsgwwr6BjPz877oQCWyEj1GqmL7nb3JAb70,896
2
- sardananxsrecorder/nxsrecorder.py,sha256=bS7vevRyLtPgz7zoK2XJid9XCTgdKAeJRZb-QK2Nl5g,58343
3
- sardana_nxsrecorder-3.26.1.dist-info/METADATA,sha256=Y56-3gdsv1UknXfjr8uyMUPVinvmbEYF_Ev-CqHlzCk,8035
4
- sardana_nxsrecorder-3.26.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
5
- sardana_nxsrecorder-3.26.1.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
6
- sardana_nxsrecorder-3.26.1.dist-info/RECORD,,