Changeset 1219 for sans/Dev/trunk/NCNR_User_Procedures/Common/Packages

Timestamp:

Oct 4, 2019 8:56:43 AM (3 years ago)

Author:

srkline

Message:

Corrections to the NGB30mSANS attenuator tables (for 3A data only).

Corrections to the sample aperture units on VSANS (change in NICE on 5/22/19).

Additions for the super white beam mode on VSANS - still in progress.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages

Files:

• LinearizedFits/LinearizedFits_v40.ipf (modified) (1 diff)
• PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf

@@ -524 +524 @@
         // ShortFileNameString is the currently selected data set, so make the user find the right data set
         //
-        Variable maxLength=25
+        Variable maxLength
+        if(IgorVersion() < 8)
+                maxLength = 25
+        else
+                maxLength = 40
+        endif
+        
         if(strlen(partialName) > maxLength)
                 // get user input, from a list of all of the data folder names

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -1086 +1086 @@
 // returns a shortened file name (26 characters max) so that the loader
 // won't try to create Igor objects that have names that are longer than 31
-// 
+//
+// if Igor 8+, use longer names (within reason)
+//
 Function/S ShortFileNameString(inStr)
         String inStr
 
         String outStr=""
-        Variable maxLength=25
+        Variable maxLength
+        
+        if(IgorVersion() < 8)
+                maxLength = 25
+        else
+                maxLength = 40
+        endif
+        
+        
         Variable nameTooLong=0
         String/G root:Packages:NIST:gShortNameStr = inStr[0,maxLength-1]