From e1fd6e357ded1aa826d8b8a20247c17c8cd37df9 Mon Sep 17 00:00:00 2001 From: reiche Date: Fri, 25 Apr 2025 17:12:12 +0200 Subject: [PATCH] Take out explicit packages paths --- .gitignore | 8 ++++++++ OpticsMachine.py | 6 +++--- OpticsModel.py | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..126b4ad --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +/unused/ +/.idea/misc.xml +/.idea/modules.xml +/.idea/OpticsTools.iml +/.idea/inspectionProfiles/profiles_settings.xml +/.idea/inspectionProfiles/Project_Default.xml +/.idea/vcs.xml +/.idea/workspace.xml diff --git a/OpticsMachine.py b/OpticsMachine.py index be7a58c..b92caf0 100644 --- a/OpticsMachine.py +++ b/OpticsMachine.py @@ -2,7 +2,7 @@ import re import sys from typing import is_typeddict -sys.path.append('/sf/bd/packages/sfbd') + from sfbd.interface import getSnapPV,getSnapVal from epics import PV @@ -21,5 +21,5 @@ class Machine: if isinstance(filters, str): filters = [filters] recomp = re.compile('|'.join(filters)) - pvget = [pv for pv in self.snapPVs if recomp.match(pv.pvname)] - self.snap = getSnapVal(pvget) \ No newline at end of file + # pvget = [pv for pv in self.snapPVs if recomp.match(pv.pvname)] + # self.snap = getSnapVal(pvget) \ No newline at end of file diff --git a/OpticsModel.py b/OpticsModel.py index 2bb8e61..da3ffa7 100644 --- a/OpticsModel.py +++ b/OpticsModel.py @@ -1,7 +1,7 @@ import sys import numpy as np -sys.path.append('/sf/bd/packages/onlinemodel') + from onlinemodel.core import Facility from onlinemodel.code import MadX