Changeset 861

Timestamp:

Aug 6, 2012 2:58:11 PM (10 years ago)

Author:

srkline

Message:

changed the number of significant digits visible in the Catalog table, so that the wavelength, SDD, and sample position don't show up as odd floating point values, when they're only off by a smidgen. If they are significantly off, the real value will be seen.

Modified the file loader for Linearized fits to correctly handle files that are loaded with file names that are too long. Now they are loaded and plotted correctly, as the plot manager does. Now, when fitting, if the file name is too long (from the popup) then the user is prompted to pick the data set, since I don't know which one it is anymore, since the name was changed. Not too big of an issue. Most (All, I hope) of the file writing routines now enforce short, compliant names. this is ticket #363

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/Packages/LinearizedFits/LinearizedFits_v40.ipf (modified) (2 diffs)
• Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)
• Reduction/SANS/CatVSTable.ipf (modified) (1 diff)

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

@@ -168 +168 @@
         //Print S_fileName
         //Print tempName
-        
-        String cleanLastFileName = CleanupName(partialName,0)
-        String dataStr = "root:"+cleanLastFileName+":"
+
+
+        String cleanLastFileName = "",dataStr = ""
+        
+        cleanLastFileName = CleanupName(partialName,0)
+        
+        //if the file name was too long, get the updated name
+        Variable maxLength=25
+        if(strlen(cleanLastFileName) > maxLength)
+                String newStr = root:Packages:NIST:gShortNameStr                //set in ShortFileNameString()
+                cleanLastFileName = newStr
+        endif
+        
+        dataStr = "root:"+cleanLastFileName+":"
+        
         tempName=dataStr + cleanLastFileName+"_q"
         Duplicate/O $tempName xAxisWave
@@ -508 +520 @@
         ControlInfo/W=FitPanel $"ywave"
         String partialName = CleanupName(S_value,0)
+        
+        //if the file name was too long, get the updated name. Can't guarantee that the global string set by
+        // ShortFileNameString is the currently selected data set, so make the user find the right data set
+        //
+        Variable maxLength=25
+        if(strlen(partialName) > maxLength)
+                // get user input, from a list of all of the data folder names
+                String dfList = sortList(GetAList(4))
+                String dataFolder=""
+                Prompt dataFolder,"Data files to choose from...",popup,dfList
+
+                DoPrompt "Select data set",dataFolder
+                if(V_Flag==1)           //user canceled
+                        SetDataFolder root:
+                        return(1)
+                endif
+                partialName = dataFolder
+        endif
         Rescale_Data("root:"+partialName+":")
         

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

@@ -975 +975 @@
                                 outStr = inStr[0,maxLength-1]
                                 //Print "modified  ",outStr
+                                newStr=outStr
                                 return(outStr)
                         endif

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

@@ -119 +119 @@
                 ModifyTable width(:myGlobals:CatVSHeaderInfo:nGuides)=40
                 ModifyTable width(:myGlobals:CatVSHeaderInfo:Pos)=30
+                ModifyTable sigDigits(:myGlobals:CatVSHeaderInfo:Pos)=3                 //to make the display look nice, given the floating point values from ICE
+                ModifyTable sigDigits(:myGlobals:CatVSHeaderInfo:Lambda)=3              //may not work in all situations, but an improvement
+                ModifyTable sigDigits(:myGlobals:CatVSHeaderInfo:SDD)=5
+                ModifyTable trailingZeros(:myGlobals:CatVSHeaderInfo:Temperature)=1
+                ModifyTable sigDigits(:myGlobals:CatVSHeaderInfo:Temperature)=4
 #endif