Changeset 741

Timestamp:

Sep 15, 2010 4:48:46 PM (12 years ago)

Author:

srkline

Message:

added a wildcard to the SDD selector for the Patch Panel.

now can use wild card at the END of the distance. the actual distance is round(SDD), so 13* will find 13.17m, and 4* will find the ICE-reported 3.9995m

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• NSORT.ipf (modified) (1 diff)
• PatchFiles.ipf (modified) (2 diffs)

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

@@ -1679 +1679 @@
         
         if(WinType("NSORT_Panel") == 0)
-                DoAlert 0, "The NSORT Panel must be open to combine the files"
+                DoAlert 0, "The SORT Panel must be open to combine the files"
                 return(0)
         endif

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

@@ -237 +237 @@
         
         // SDD
+        Variable pos
+        String SDDStr=""
         if(gRadioVal == 3)
-                val = str2num(match)
+                pos = strsearch(match, "*", 0)
+                if(pos == -1)           //no wildcard
+                        val = str2num(match)
+                else
+                        val = str2num(match[0,pos-1])
+                endif
+                
 //              print val
                 for(ii=0;ii<num;ii+=1)
@@ -244 +252 @@
                         fname = path + item
                         sdd = getSDD(fname)
-                        if(abs(val - sdd) < 0.001       )               //if numerically within 0.001 meter, they're the same
-                                list += item + ";"
+                        if(pos == -1)
+                                //no wildcard
+                                if(abs(val - sdd) < 0.01        )               //if numerically within 0.01 meter, they're the same
+                                        list += item + ";"
+                                endif
+                        else
+                                //yes, wildcard, try a string match?
+                                // string match doesn't work -- 1* returns 1m and 13m data
+                                // round the value (or truncate?)
+                                
+                                //SDDStr = num2str(sdd)
+                                //if(strsearch(SDDStr,match[0,pos-1],0) != -1)
+                                //      list += item + ";"
+                                //endif
+                                
+                                if(abs(val - round(sdd)) < 0.01 )               //if numerically within 0.01 meter, they're the same
+                                        list += item + ";"
+                                endif
+        
                         endif
                 endfor