debug

iexcode/instruments/IEX_BL_config.py

+from os import mkdir
+from os.path import join,exists
+
+
 from iexcode.instruments.scanRecord import ScanRecord
 from iexcode.instruments.utilities import print_warning_message
 

iexcode/instruments/Logfile.py

@@ -134,7 +134,7 @@ class Logfile:
         """
         pv = PV(self._name_pv())
         if pv.connected:    
-            name = caget(pv,as_string=True)
+            name = caget(self._name_pv(),as_string=True)
         else: 
             name = "logfile.txt"
         return name

iexcode/instruments/VLS_PGM.py

@@ -23,7 +23,7 @@ def mono_grating_names():
     """
     ext = ['C',      'D',       'E',    'F',      'G',       'H',       'I',       "J",       "K",        "L"     ]
     GRT_names = ["MEG_Imp","HEG","MEG","Dummy",  "not used", "not used", "not used","not used","not used","not used"]
-    GRT_names=GRT_names[0:3] # only use the first 3 slots
+    #GRT_names=GRT_names[0:3] # only use the first 3 slots
     return GRT_names
 
 def mono_mirror_names():
@@ -33,7 +33,7 @@ def mono_mirror_names():
     """
     ext = ['C',      'D',       'E',    'F',      'G',       'H',       'I',       "J",       "K",        "L"     ]
     MIR_names = ["Au", "Silicon", "Carbon","not used","not used","not used","not used","not used","not used","not used"]
-    MIR_names=MIR_names[0:3] # only use the first 3 slots
+    #MIR_names=MIR_names[0:3] # only use the first 3 slots
     return MIR_names
 
 def _mono_extensions():

iexcode/instruments/m3r_align.py

@@ -135,7 +135,7 @@ def m3r_align(target_pixel=None, precision=0.5, num_tries=10, verbose=True):
     if target_pixel == None:
         target_pixel = m3r_align_pv_dictionary()['desired_pixel'] 
     
-    if iex.BL.branch()=='d':
+    if iex.BL.branch =='d':
         # coarse aligment
         pixel_delta = m3r_align_stats_centroid_posx()-target_pixel
         voltage_delta = m3r_align_pixel2voltage(pixel_delta)

iexcode/instruments/xrays.py

@@ -270,8 +270,10 @@ def apertures_set(c_2B=1,c_1A=1,verbose=True):
 
     if grt == 'MEG':
         V=0.65        #  set to 65% of RR calculation for both grt => cf 2016_2_summary
-    elif grt=='HEG':
+    if grt=='HEG':
         V=0.65*c        #  set to 65% of RR calculation (no longer 80%) => cf 2016_2_summary
+    else:
+        V=0.65
 
     try:
         slit_position = read_dict('Dict_Slit.txt')

iexcode/macros/start_up.py

+from os import mkdir
+from os.path import join,exists
+
+
 import iexcode.instruments.cfg as iex
+from iexcode.instruments.ARPES import folders_ARPES,ARPES_init
+from iexcode.instruments.Kappa import folders_kappa, kappa_init
 
-from iexcode.instruments.ARPES import folders_ARPES
-from iexcode.instruments.kappa import folders_kappa
 
 def folders_startup(run):
     """
@@ -16,7 +20,7 @@ def folders_startup(run):
 
     previously: Folders_Startup
     """
-    data_directories=['data_29idb','data_29idc','data_29idd']
+    data_directories=['data_29idb','data_29idc','data_29idd','data_29ide']
     dserv="/net/s29data/export/"
     for dataDir in data_directories:
         path=join(dserv,dataDir,run)
@@ -24,11 +28,20 @@ def folders_startup(run):
         if not (exists(path)):
             mkdir(path)
 
-    folders_ARPES('Staff',create_only=True)
-    folders_kappa('Staff',create_only=True)
+    dets = ARPES_init('staff')
+    folders_ARPES('staff',set_folders=False)
+
+    dets = kappa_init('staff')
+    folders_kappa('staff',set_folders=False)
+
+    print_crontab(run)
 
+def print_crontab(run):
     txt="\n\n\nupdate the rsync portion the 29id@nerdy crontab\n"
-    txt+="*/1 * * * * /usr/bin/rsync -av --exclude=core /net/s29data/export/data_29idd/"+run+" kip:/net/kip/sftp/pub/29iddftp/files >  /home/beams22/29ID/cronfiles/cptoftp-currrun-d.log 2>&1"
+    txt+="*/1 * * * * /usr/bin/rsync -av --exclude=core /net/s29data/export/data_29idc/"+run+" kip:/net/kip/sftp/pub/29idcftp/files >  /home/beams22/29ID/cronfiles/cptoftp-currrun-c.log 2>&1"
     txt+=("\n")
     txt+="*/1 * * * * /usr/bin/rsync -av --exclude=core /net/s29data/export/data_29idd/"+run+" kip:/net/kip/sftp/pub/29iddftp/files >  /home/beams22/29ID/cronfiles/cptoftp-currrun-d.log 2>&1"
+    txt+=("\n")
+    txt+="*/1 * * * * /usr/bin/rsync -av --exclude=core /net/s29data/export/data_29ide/"+run+" kip:/net/kip/sftp/pub/29ideftp/files >  /home/beams22/29ID/cronfiles/cptoftp-currrun-e.log 2>&1"
+
     print(txt)
\ No newline at end of file