Changeset 741
- Timestamp:
- Sep 15, 2010 4:48:46 PM (12 years ago)
- Location:
- sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf
r738 r741 1679 1679 1680 1680 if(WinType("NSORT_Panel") == 0) 1681 DoAlert 0, "The NSORT Panel must be open to combine the files"1681 DoAlert 0, "The SORT Panel must be open to combine the files" 1682 1682 return(0) 1683 1683 endif -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/PatchFiles.ipf
r573 r741 237 237 238 238 // SDD 239 Variable pos 240 String SDDStr="" 239 241 if(gRadioVal == 3) 240 val = str2num(match) 242 pos = strsearch(match, "*", 0) 243 if(pos == -1) //no wildcard 244 val = str2num(match) 245 else 246 val = str2num(match[0,pos-1]) 247 endif 248 241 249 // print val 242 250 for(ii=0;ii<num;ii+=1) … … 244 252 fname = path + item 245 253 sdd = getSDD(fname) 246 if(abs(val - sdd) < 0.001 ) //if numerically within 0.001 meter, they're the same 247 list += item + ";" 254 if(pos == -1) 255 //no wildcard 256 if(abs(val - sdd) < 0.01 ) //if numerically within 0.01 meter, they're the same 257 list += item + ";" 258 endif 259 else 260 //yes, wildcard, try a string match? 261 // string match doesn't work -- 1* returns 1m and 13m data 262 // round the value (or truncate?) 263 264 //SDDStr = num2str(sdd) 265 //if(strsearch(SDDStr,match[0,pos-1],0) != -1) 266 // list += item + ";" 267 //endif 268 269 if(abs(val - round(sdd)) < 0.01 ) //if numerically within 0.01 meter, they're the same 270 list += item + ";" 271 endif 272 248 273 endif 249 274 endfor
Note: See TracChangeset
for help on using the changeset viewer.