Changeset 921 for sans/Dev

Timestamp:

Sep 12, 2013 10:11:24 AM (10 years ago)

Author:

srkline

Message:

fixed an issue in Invariant where the file loader would fail if it tried to load in a name that was too long and needed to be truncated. Issue was resolved and updated to behave like the main file loader. Another good reason to consolidate the file loaders rather than have them scattered around...

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/Packages/Invariant/Invariant_v40.ipf (modified) (1 diff)
• Reduction/SANS/MC_SimulationScripting.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

@@ -627 +627 @@
         //Print S_fileName
         //Print tempName
-        
-        String cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0)
+
+// if the data loader forced a shorter name, get it now
+        String newStr = root:Packages:NIST:gShortNameStr
+        String cleanLastFileName
+        if(strlen(newStr) > 0)
+                 cleanLastFileName = CleanupName(newStr,0)
+        else
+                 cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0)
+        endif
+        
         String dataStr = "root:"+cleanLastFileName+":"
+
         
         // keep global copies of the names rather than reading from the popup

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MC_SimulationScripting.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
+
+
+
+
+//************
+// un-comment the Macros menu declaration to provide easier access to the functions
+//************
+
+
 
 // this is a file with all of the functions that can be used to
 // script the MC simulation of data
-// 1D will also be supported, unless I can find a reason not to support this.
-//
-// there will be a lot of utility functions to "move" the parts of an instrument that
+//
+// there are a lot of utility functions to "move" the parts of an instrument that
 // are "moveable" into different configurations. The aim is to have this appear as
 // much like running an experiment as possible.
@@ -542 +550 @@
 
 //
-// Important - in the reduction process, set the  dead time correction to something
+// Important - in the reduction process, set the dead time correction to something
 // really small, say 10^-15 so that  it won't have any effect (since the detector CR is fictionally high)
 //