Changeset 418
- Timestamp:
- Oct 7, 2008 1:09:04 PM (14 years ago)
- Location:
- sans/Dev/trunk
- Files:
-
- 25 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/GaussUtils_v40.ipf
r353 r418 61 61 EndStructure 62 62 63 // utility used in the "PlotSmeared...() macros to get a list of data folders 64 // 65 //1: Waves. 66 //2: Numeric variables. 67 //3: String variables. 68 //4: Data folders. 69 Function/S GetAList(type) 70 Variable type 71 72 SetDataFolder root: 73 74 String objName,str="" 75 Variable index = 0 76 do 77 objName = GetIndexedObjName(":", type, index) 78 if (strlen(objName) == 0) 79 break 80 endif 81 //Print objName 82 str += objName + ";" 83 index += 1 84 while(1) 85 86 // remove myGlobals, Packages from the folder list 87 if(type==4) 88 str = RemoveFromList("myGlobals", str , ";" ) 89 str = RemoveFromList("Packages", str, ";") 90 str = RemoveFromList("AutoFit", str, ";") 91 endif 92 93 return(str) 94 End 63 95 64 96 65 -
sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf
r414 r418 70 70 // if it's right there, it's right here 71 71 Function/S A_OneDDataInMemory() 72 String list = W_DataSetPopupList() 72 //AJJ Oct 2008 73 //To make this general for both analysis and reduction this code must be a duplicate 74 //W_DataPopupList rather than a call to it as IGOR doesn't like assignment to function 75 //that doesn't exists even if you've done a if(exists... to check first. 76 //Grrr 77 String list = GetAList(4) 78 if (strlen(list) == 0) 79 list = "No data loaded" 80 endif 81 list = SortList(list) 82 73 83 return(list) 74 84 end -
sans/Dev/trunk/NCNR_User_Procedures/Common/PlotUtilsMacro_v40.ipf
r409 r418 768 768 769 769 End 770 771 //AJJ Oct 2008 772 //Moved from GaussUtils - makes more sense to have it here 773 774 // utility used in the "PlotSmeared...() macros to get a list of data folders 775 // 776 //1: Waves. 777 //2: Numeric variables. 778 //3: String variables. 779 //4: Data folders. 780 Function/S GetAList(type) 781 Variable type 782 783 SetDataFolder root: 784 785 String objName,str="" 786 Variable index = 0 787 do 788 objName = GetIndexedObjName(":", type, index) 789 if (strlen(objName) == 0) 790 break 791 endif 792 //Print objName 793 str += objName + ";" 794 index += 1 795 while(1) 796 797 // remove myGlobals, Packages from the folder list 798 if(type==4) 799 str = RemoveFromList("myGlobals", str , ";" ) 800 str = RemoveFromList("Packages", str, ";") 801 str = RemoveFromList("AutoFit", str, ";") 802 endif 803 804 return(str) 805 End -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf
r412 r418 71 71 72 72 //Check for logscale data in "type" folder 73 String dest = "root: "+type73 String dest = "root:Packages:NIST:"+type 74 74 75 75 NVAR isLogScale = $(dest + ":gIsLogScale") … … 361 361 //get the beam center from the currently displayed data type 362 362 SVAR type = root:myGlobals:gDataDisplayType 363 Wave reals = $("root: "+type+":RealsRead")363 Wave reals = $("root:Packages:NIST:"+type+":RealsRead") 364 364 Variable x0,y0,x1,y1 365 365 x0 = reals[16] - 1 //convert to [0,127] from (1,128) detector … … 1059 1059 // SetDataFolder curPath 1060 1060 //get the untarnished data, so we can rescale it freshly here 1061 Wave yw = $("root: "+curFolder+":aveint")1062 Wave ew = $("root: "+curFolder+":sigave")1061 Wave yw = $("root:Packages:NIST:"+curFolder+":aveint") 1062 Wave ew = $("root:Packages:NIST:"+curFolder+":sigave") 1063 1063 //get the correct x values 1064 1064 NVAR isPhiAve= root:myGlobals:Plot_1d:isPhiAve //0 signifies (normal) x=qvals 1065 1065 if(isPhiAve) 1066 1066 //x is angle 1067 Wave xw=$("root: "+curFolder+":phival")1067 Wave xw=$("root:Packages:NIST:"+curFolder+":phival") 1068 1068 else 1069 1069 //x is q-values 1070 Wave xw=$("root: "+curFolder+":qval")1070 Wave xw=$("root:Packages:NIST:"+curFolder+":qval") 1071 1071 endif 1072 1072 Wave yAxisWave=root:myGlobals:Plot_1d:yAxisWave //refs to waves to be modified, hard-wired positions -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Buttons.ipf
r412 r418 46 46 //get the current displayed data (so the correct folder is used) 47 47 SVAR cur_folder=root:myGlobals:gDataDisplayType 48 String cur = "root: "+cur_folder48 String cur = "root:Packages:NIST:"+cur_folder 49 49 50 50 WAVE reals=$(cur + ":realsread") … … 93 93 //get the current displayed data (so the correct folder is used) 94 94 SVAR cur_folder=root:myGlobals:gDataDisplayType 95 SetDataFolder "root: "+cur_folder //use the full path, so it will always work95 SetDataFolder "root:Packages:NIST:"+cur_folder //use the full path, so it will always work 96 96 WAVE data = $"data" 97 97 // WAVE vlegend = $"vlegend" … … 210 210 211 211 //take the currently displayed RAW file (there is only one name in fileList) 212 SVAR oldName = root: RAW:fileList212 SVAR oldName = root:Packages:NIST:RAW:fileList 213 213 214 214 //get the run number … … 251 251 endif 252 252 253 CheckDisplayed/W=SANS_Data root: MSK:overlay253 CheckDisplayed/W=SANS_Data root:Packages:NIST:MSK:overlay 254 254 if(V_flag==1) //the overlay is present 255 255 Button $ctrlName,title="Show Mask",win=SANS_Data -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CircSectAve.ipf
r412 r418 40 40 //type is the data type to do the averaging on, and will be set as the current folder 41 41 //get the current displayed data (so the correct folder is used) 42 String destPath = "root: "+type42 String destPath = "root:Packages:NIST:"+type 43 43 44 44 // … … 93 93 //Check for the existence of the mask, if not, make one (local to this folder) that is null 94 94 95 if(WaveExists($"root: MSK:data") == 0)95 if(WaveExists($"root:Packages:NIST:MSK:data") == 0) 96 96 Print "There is no mask file loaded (WaveExists)- the data is not masked" 97 97 Make/O/N=(pixelsX,pixelsY) $(destPath + ":mask") … … 99 99 mask = 0 100 100 else 101 Wave mask=$"root: MSK:data"101 Wave mask=$"root:Packages:NIST:MSK:data" 102 102 Endif 103 103 … … 452 452 453 453 //Check for logscale data in "type" folder 454 SetDataFolder "root: "+type //use the full path, so it will always work455 String dest = "root: " + type454 SetDataFolder "root:Packages:NIST:"+type //use the full path, so it will always work 455 String dest = "root:Packages:NIST:" + type 456 456 457 457 NVAR isLogScale = $(dest + ":gIsLogScale") -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Correct.ipf
r412 r418 88 88 //check for trans==1 89 89 NVAR doCheck=root:myGlobals:gDoTransCheck 90 Wave/Z samR=root: SAM:RealsRead91 Wave/Z empR=root: EMP:RealsRead90 Wave/Z samR=root:Packages:NIST:SAM:RealsRead 91 Wave/Z empR=root:Packages:NIST:EMP:RealsRead 92 92 if(doCheck) 93 93 trans = samR[4] … … 237 237 238 238 //create the necessary wave references 239 WAVE sam_data=$"root: SAM:data"240 WAVE sam_reals=$"root: SAM:realsread"241 WAVE sam_ints=$"root :SAM:integersread"242 WAVE/T sam_text=$"root: SAM:textread"243 WAVE bgd_data=$"root: BGD:data"244 WAVE bgd_reals=$"root: BGD:realsread"245 WAVE bgd_ints=$"root: BGD:integersread"246 WAVE/T bgd_text=$"root: BGD:textread"247 WAVE emp_data=$"root: EMP:data"248 WAVE emp_reals=$"root: EMP:realsread"249 WAVE emp_ints=$"root: EMP:integersread"250 WAVE/T emp_text=$"root: EMP:textread"251 WAVE cor_data=$"root: COR:data"252 WAVE/T cor_text=$"root: COR:textread"239 WAVE sam_data=$"root:Packages:NIST:SAM:data" 240 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 241 WAVE sam_ints=$"rootPackages:NIST::SAM:integersread" 242 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 243 WAVE bgd_data=$"root:Packages:NIST:BGD:data" 244 WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 245 WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 246 WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 247 WAVE emp_data=$"root:Packages:NIST:EMP:data" 248 WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 249 WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 250 WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 251 WAVE cor_data=$"root:Packages:NIST:COR:data" 252 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 253 253 254 254 //get sam and bgd attenuation factors … … 338 338 339 339 //create the necessary wave references 340 WAVE sam_data=$"root: SAM:data"341 WAVE sam_reals=$"root: SAM:realsread"342 WAVE sam_ints=$"root: SAM:integersread"343 WAVE/T sam_text=$"root: SAM:textread"344 WAVE bgd_data=$"root: BGD:data"345 WAVE bgd_reals=$"root: BGD:realsread"346 WAVE bgd_ints=$"root: BGD:integersread"347 WAVE/T bgd_text=$"root: BGD:textread"348 WAVE cor_data=$"root: COR:data"349 WAVE/T cor_text=$"root: COR:textread"340 WAVE sam_data=$"root:Packages:NIST:SAM:data" 341 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 342 WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 343 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 344 WAVE bgd_data=$"root:Packages:NIST:BGD:data" 345 WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 346 WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 347 WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 348 WAVE cor_data=$"root:Packages:NIST:COR:data" 349 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 350 350 351 351 //get sam and bgd attenuation factors … … 414 414 Function CorrectMode_3() 415 415 //create the necessary wave references 416 WAVE sam_data=$"root: SAM:data"417 WAVE sam_reals=$"root: SAM:realsread"418 WAVE sam_ints=$"root: SAM:integersread"419 WAVE/T sam_text=$"root: SAM:textread"420 WAVE emp_data=$"root: EMP:data"421 WAVE emp_reals=$"root: EMP:realsread"422 WAVE emp_ints=$"root: EMP:integersread"423 WAVE/T emp_text=$"root: EMP:textread"424 WAVE cor_data=$"root: COR:data"425 WAVE/T cor_text=$"root: COR:textread"416 WAVE sam_data=$"root:Packages:NIST:SAM:data" 417 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 418 WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 419 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 420 WAVE emp_data=$"root:Packages:NIST:EMP:data" 421 WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 422 WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 423 WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 424 WAVE cor_data=$"root:Packages:NIST:COR:data" 425 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 426 426 427 427 //get sam and bgd attenuation factors … … 496 496 Function CorrectMode_4() 497 497 //create the necessary wave references 498 WAVE sam_data=$"root: SAM:data"499 WAVE sam_reals=$"root: SAM:realsread"500 WAVE sam_ints=$"root: SAM:integersread"501 WAVE/T sam_text=$"root: SAM:textread"502 503 WAVE cor_data=$"root: COR:data"504 WAVE/T cor_text=$"root: COR:textread"498 WAVE sam_data=$"root:Packages:NIST:SAM:data" 499 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 500 WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 501 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 502 503 WAVE cor_data=$"root:Packages:NIST:COR:data" 504 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 505 505 506 506 //get sam and bgd attenuation factors … … 531 531 Function CorrectMode_11() 532 532 //create the necessary wave references 533 WAVE sam_data=$"root: SAM:data"534 WAVE sam_reals=$"root: SAM:realsread"535 WAVE sam_ints=$"root: SAM:integersread"536 WAVE/T sam_text=$"root: SAM:textread"537 WAVE bgd_data=$"root: BGD:data"538 WAVE bgd_reals=$"root: BGD:realsread"539 WAVE bgd_ints=$"root: BGD:integersread"540 WAVE/T bgd_text=$"root: BGD:textread"541 WAVE emp_data=$"root: EMP:data"542 WAVE emp_reals=$"root: EMP:realsread"543 WAVE emp_ints=$"root: EMP:integersread"544 WAVE/T emp_text=$"root: EMP:textread"545 WAVE drk_data=$"root: DRK:data"546 WAVE drk_reals=$"root: DRK:realsread"547 WAVE drk_ints=$"root: DRK:integersread"548 WAVE/T drk_text=$"root: DRK:textread"549 WAVE cor_data=$"root: COR:data"550 WAVE/T cor_text=$"root: COR:textread"533 WAVE sam_data=$"root:Packages:NIST:SAM:data" 534 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 535 WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 536 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 537 WAVE bgd_data=$"root:Packages:NIST:BGD:data" 538 WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 539 WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 540 WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 541 WAVE emp_data=$"root:Packages:NIST:EMP:data" 542 WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 543 WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 544 WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 545 WAVE drk_data=$"root:Packages:NIST:DRK:data" 546 WAVE drk_reals=$"root:Packages:NIST:DRK:realsread" 547 WAVE drk_ints=$"root:Packages:NIST:DRK:integersread" 548 WAVE/T drk_text=$"root:Packages:NIST:DRK:textread" 549 WAVE cor_data=$"root:Packages:NIST:COR:data" 550 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 551 551 552 552 //get sam and bgd attenuation factors … … 643 643 Function CorrectMode_12() 644 644 //create the necessary wave references 645 WAVE sam_data=$"root: SAM:data"646 WAVE sam_reals=$"root: SAM:realsread"647 WAVE sam_ints=$"root: SAM:integersread"648 WAVE/T sam_text=$"root: SAM:textread"649 WAVE bgd_data=$"root: BGD:data"650 WAVE bgd_reals=$"root: BGD:realsread"651 WAVE bgd_ints=$"root: BGD:integersread"652 WAVE/T bgd_text=$"root: BGD:textread"653 WAVE drk_data=$"root: DRK:data"654 WAVE drk_reals=$"root: DRK:realsread"655 WAVE drk_ints=$"root: DRK:integersread"656 WAVE/T drk_text=$"root: DRK:textread"657 WAVE cor_data=$"root: COR:data"658 WAVE/T cor_text=$"root: COR:textread"645 WAVE sam_data=$"root:Packages:NIST:SAM:data" 646 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 647 WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 648 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 649 WAVE bgd_data=$"root:Packages:NIST:BGD:data" 650 WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 651 WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 652 WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 653 WAVE drk_data=$"root:Packages:NIST:DRK:data" 654 WAVE drk_reals=$"root:Packages:NIST:DRK:realsread" 655 WAVE drk_ints=$"root:Packages:NIST:DRK:integersread" 656 WAVE/T drk_text=$"root:Packages:NIST:DRK:textread" 657 WAVE cor_data=$"root:Packages:NIST:COR:data" 658 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 659 659 660 660 //get sam and bgd attenuation factors … … 729 729 Function CorrectMode_13() 730 730 //create the necessary wave references 731 WAVE sam_data=$"root: SAM:data"732 WAVE sam_reals=$"root: SAM:realsread"733 WAVE sam_ints=$"root: SAM:integersread"734 WAVE/T sam_text=$"root: SAM:textread"735 WAVE emp_data=$"root: EMP:data"736 WAVE emp_reals=$"root: EMP:realsread"737 WAVE emp_ints=$"root: EMP:integersread"738 WAVE/T emp_text=$"root: EMP:textread"731 WAVE sam_data=$"root:Packages:NIST:SAM:data" 732 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 733 WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 734 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 735 WAVE emp_data=$"root:Packages:NIST:EMP:data" 736 WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 737 WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 738 WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 739 739 WAVE drk_data=$"root:DRK:data" 740 740 WAVE drk_reals=$"root:DRK:realsread" 741 741 WAVE drk_ints=$"root:DRK:integersread" 742 742 WAVE/T drk_text=$"root:DRK:textread" 743 WAVE cor_data=$"root: COR:data"744 WAVE/T cor_text=$"root: COR:textread"743 WAVE cor_data=$"root:Packages:NIST:COR:data" 744 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 745 745 746 746 //get sam and bgd attenuation factors (DRK irrelevant) … … 820 820 Function CorrectMode_14() 821 821 //create the necessary wave references 822 WAVE sam_data=$"root: SAM:data"823 WAVE sam_reals=$"root: SAM:realsread"824 WAVE sam_ints=$"root: SAM:integersread"825 WAVE/T sam_text=$"root: SAM:textread"822 WAVE sam_data=$"root:Packages:NIST:SAM:data" 823 WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 824 WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 825 WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 826 826 827 827 WAVE drk_data=$"root:DRK:data" … … 829 829 WAVE drk_ints=$"root:DRK:integersread" 830 830 WAVE/T drk_text=$"root:DRK:textread" 831 WAVE cor_data=$"root: COR:data"832 WAVE/T cor_text=$"root: COR:textread"831 WAVE cor_data=$"root:Packages:NIST:COR:data" 832 WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 833 833 834 834 //get sam and bgd attenuation factors … … 933 933 934 934 String destPath="" 935 destPath = "root: "+Type + ":data"935 destPath = "root:Packages:NIST:"+Type + ":data" 936 936 if(WaveExists($destpath) == 0) 937 937 Print "There is no work file in "+type … … 1064 1064 String type = "SAM" 1065 1065 //check for SAM 1066 destPath = "root: "+Type + ":data"1066 destPath = "root:Packages:NIST:"+Type + ":data" 1067 1067 if(WaveExists($destpath) == 0) 1068 1068 Print "There is no work file in "+type+"--Aborting" … … 1071 1071 //check for log-scaling of the "SAM" data and adjust if necessary 1072 1072 ConvertFolderToLinearScale(type) 1073 Wave sam_data = $"root: SAM:data"1073 Wave sam_data = $"root:Packages:NIST:SAM:data" 1074 1074 Endif 1075 1075 … … 1077 1077 if( (mode ==1) || (mode==2) || (mode==11) || (mode==12) ) 1078 1078 type = "BGD" 1079 destPath = "root: "+Type + ":data"1079 destPath = "root:Packages:NIST:"+Type + ":data" 1080 1080 if(WaveExists($destpath) == 0) 1081 1081 Print "There is no work file in "+type+"--Aborting" … … 1084 1084 //check for log-scaling of the "BGD" data and adjust if necessary 1085 1085 ConvertFolderToLinearScale(type) 1086 Wave bgd_data = $"root: BGD:data"1086 Wave bgd_data = $"root:Packages:NIST:BGD:data" 1087 1087 Endif 1088 1088 Endif … … 1091 1091 if( (mode==1) || (mode==3) || (mode==11) || (mode==13) ) 1092 1092 type = "EMP" 1093 destPath = "root: "+Type + ":data"1093 destPath = "root:Packages:NIST:"+Type + ":data" 1094 1094 if(WaveExists($destpath) == 0) 1095 1095 Print "There is no work file in "+type+"--Aborting" … … 1098 1098 //check for log-scaling of the "EMP" data and adjust if necessary 1099 1099 ConvertFolderToLinearScale(type) 1100 Wave emp_data = $"root: EMP:data"1100 Wave emp_data = $"root:Packages:NIST:EMP:data" 1101 1101 Endif 1102 1102 Endif … … 1105 1105 if( (mode==11) || (mode==12) || (mode==13) || (mode==14) ) 1106 1106 type = "DRK" 1107 destPath = "root: "+Type + ":data"1107 destPath = "root:Packages:NIST:"+Type + ":data" 1108 1108 if(WaveExists($destpath) == 0) 1109 1109 Print "There is no work file in "+type+"--Aborting" … … 1120 1120 //make needed wave references to other folders 1121 1121 //NOTE that these references MAY NOT EXIST, depending on the mode 1122 WAVE sam_reals = $"root: SAM:realsread"1123 WAVE sam_ints = $"root: SAM:integersread"1124 WAVE/T sam_text = $"root: SAM:textread"1125 WAVE/Z emp_reals = $"root: EMP:realsread"1126 WAVE/Z emp_ints = $"root: EMP:integersread"1127 WAVE/T/Z emp_text = $"root: EMP:textread"1128 WAVE/Z bgd_reals = $"root: BGD:realsread"1129 WAVE/Z bgd_ints = $"root: BGD:integersread"1130 WAVE/T/Z bgd_text = $"root: BGD:textread"1122 WAVE sam_reals = $"root:Packages:NIST:SAM:realsread" 1123 WAVE sam_ints = $"root:Packages:NIST:SAM:integersread" 1124 WAVE/T sam_text = $"root:Packages:NIST:SAM:textread" 1125 WAVE/Z emp_reals = $"root:Packages:NIST:EMP:realsread" 1126 WAVE/Z emp_ints = $"root:Packages:NIST:EMP:integersread" 1127 WAVE/T/Z emp_text = $"root:Packages:NIST:EMP:textread" 1128 WAVE/Z bgd_reals = $"root:Packages:NIST:BGD:realsread" 1129 WAVE/Z bgd_ints = $"root:Packages:NIST:BGD:integersread" 1130 WAVE/T/Z bgd_text = $"root:Packages:NIST:BGD:textread" 1131 1131 1132 1132 //find the attenuation of the sample (if any) … … 1147 1147 1148 1148 //now switch to COR folder 1149 DestPath="root: COR"1149 DestPath="root:Packages:NIST:COR" 1150 1150 //make appropriate wave references 1151 1151 WAVE data=$(destPath + ":data") // these wave references point to the SAM data in COR … … 1169 1169 1170 1170 //make needed wave references to other folders 1171 Wave sam_reals = $"root: SAM:realsread"1172 Wave bgd_reals = $"root: BGD:realsread"1173 Wave emp_reals = $"root: EMP:realsread"1171 Wave sam_reals = $"root:Packages:NIST:SAM:realsread" 1172 Wave bgd_reals = $"root:Packages:NIST:BGD:realsread" 1173 Wave emp_reals = $"root:Packages:NIST:EMP:realsread" 1174 1174 1175 1175 //get counts, trans, etc. from file headers … … 1379 1379 1380 1380 //clean up 1381 SetDataFolder root: COR1381 SetDataFolder root:Packages:NIST:COR 1382 1382 SetDataFolder root: 1383 1383 KillWaves/Z cor1,cor2,noadd -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/DisplayUtils.ipf
r412 r418 23 23 //macro will take whatever is in "type" folder 24 24 //check the contents of "type" to make sure that data exists 25 String wavePath = "root: "+type+":data"25 String wavePath = "root:Packages:NIST:"+type+":data" 26 26 if(WaveExists($wavePath) == 0) 27 27 String errString="There is no data in "+type … … 174 174 else 175 175 //check the contents of "type" to make sure that data exists 176 String wavePath = "root: "+type+":data"176 String wavePath = "root:Packages:NIST:"+type+":data" 177 177 if(WaveExists($wavePath) == 0) 178 178 String errString="There is no data in "+type … … 203 203 204 204 //check the contents of "type" to make sure that data exists 205 String wavePath = "root: "+type+":data"205 String wavePath = "root:Packages:NIST:"+type+":data" 206 206 if(WaveExists($wavePath) == 0) 207 207 Abort "There is no data in "+type … … 224 224 String folder 225 225 226 String dest = "root: "+folder226 String dest = "root:Packages:NIST:"+folder 227 227 NVAR isLogscale = $(dest + ":gIsLogScale") 228 228 If(!isLogScale) … … 262 262 String folder 263 263 264 String dest = "root: "+folder264 String dest = "root:Packages:NIST:"+folder 265 265 NVAR isLogscale = $(dest + ":gIsLogScale") 266 266 // Print "ConvertFolderToLogScale() -- ",dest," has gIsLogscale = ",isLogScale -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520.ipf
r417 r418 27 27 #include "PatchFiles" version>=5.0 28 28 //#include "PlotUtils" version>=5.0 29 #include "PlotUtilsMacro_v40" version>=4.0 29 //AJJ October 2008 - switch to shared file loader 30 #include "PlotUtilsMacro_v40" 31 #include "NIST_XML_v40" 32 #include "USANS_SlitSmearing_v40" 33 // 30 34 #include "ProDiv" version>=5.0 31 35 #include "ProtocolAsPanel" version>=5.0 … … 54 58 55 59 #include "TISANE" 60 61 62 //AJJ Oct 2008 63 #include "PlotManager_v40" 56 64 57 65 // to include the analysis packages, uncomment the following -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Initialize.ipf
r412 r418 52 52 Function InitFolders() 53 53 54 NewDataFolder/O root:Packages 55 NewDataFolder/O root:Packages:NIST 56 54 57 NewDataFolder/O root:myGlobals 55 58 NewDataFolder/O root:myGlobals:CatVSHeaderInfo 56 NewDataFolder/O root:RAW 57 NewDataFolder/O root:SAM 58 NewDataFolder/O root:EMP 59 NewDataFolder/O root:BGD 60 NewDataFolder/O root:COR 61 NewDataFolder/O root:DIV 62 NewDataFolder/O root:MSK 63 NewDataFolder/O root:ABS 64 NewDataFolder/O root:CAL 65 NewDataFolder/O root:STO 66 NewDataFolder/O root:SUB 67 NewDataFolder/O root:DRK 59 NewDataFolder/O root:Packages:NIST:RAW 60 NewDataFolder/O root:Packages:NIST:SAM 61 NewDataFolder/O root:Packages:NIST:EMP 62 NewDataFolder/O root:Packages:NIST:BGD 63 NewDataFolder/O root:Packages:NIST:COR 64 NewDataFolder/O root:Packages:NIST:DIV 65 NewDataFolder/O root:Packages:NIST:MSK 66 NewDataFolder/O root:Packages:NIST:ABS 67 NewDataFolder/O root:Packages:NIST:CAL 68 NewDataFolder/O root:Packages:NIST:STO 69 NewDataFolder/O root:Packages:NIST:SUB 70 NewDataFolder/O root:Packages:NIST:DRK 71 72 68 73 69 74 Return(0) -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Marquee.ipf
r412 r418 32 32 Variable counts = 0,ii,jj 33 33 34 String dest = "root: "+type34 String dest = "root:Packages:NIST:"+type 35 35 36 36 //check for logscale data, but don't change the data … … 121 121 //now change the extra variables in the empty beam file 122 122 //get the filename from the SAM folder (there will only be one file) 123 SVAR partialName = root: SAM:FileList123 SVAR partialName = root:Packages:NIST:SAM:FileList 124 124 //construct valid filename, then prepend path 125 125 String tempName = FindValidFilename(partialName) … … 158 158 //get the current displayed data (so the correct folder is used) 159 159 SVAR cur_folder=root:myGlobals:gDataDisplayType 160 String dest = "root: " + cur_folder160 String dest = "root:Packages:NIST:" + cur_folder 161 161 162 162 Variable xzsum,yzsum,zsum,xctr,yctr … … 455 455 endif 456 456 SVAR cur_folder=root:myGlobals:gDataDisplayType 457 WAVE data=$("root: "+cur_folder+":data") //don't care if it's log or linear scale457 WAVE data=$("root:Packages:NIST:"+cur_folder+":data") //don't care if it's log or linear scale 458 458 Make/O/N=(max(xwidth,ywidth)+1) Position,AvgCounts 459 459 AvgCounts=0 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MaskUtils.ipf
r412 r418 21 21 //reads the data (1=mask, 0 = no mask) 22 22 //and plots a quickie image to make sure it's ok 23 //data is always read into root: MSK folder23 //data is always read into root:Packages:NIST:MSK folder 24 24 // 25 25 Proc ReadMASK() 26 26 27 //SetDataFolder root: MSK27 //SetDataFolder root:Packages:NIST:MSK 28 28 String fname = PromptForPath("Select Mask file") 29 29 if(strlen(fname)==0) … … 32 32 ReadMCID_MASK(fname) 33 33 34 //SetDataFolder root: MSK34 //SetDataFolder root:Packages:NIST:MSK 35 35 //// SRK SEP06 disable plot of mask data, just show the overlay 36 //// String waveStr = "root: MSK:data"36 //// String waveStr = "root:Packages:NIST:MSK:data" 37 37 //// NewImage/F/S=2/K=1 $waveStr 38 38 //// ModifyImage '' ctab= {*,*,YellowHot,0} … … 45 45 46 46 47 //reads the mask data into the root: MSK folder47 //reads the mask data into the root:Packages:NIST:MSK folder 48 48 //setDataFolder is required here 49 49 //y-values must be flipped to get proper array assignment of the mask … … 56 56 NVAR pixelsX = root:myGlobals:gNPixelsX 57 57 NVAR pixelsY = root:myGlobals:gNPixelsY 58 SetDataFolder root: MSK58 SetDataFolder root:Packages:NIST:MSK 59 59 Killwaves/Z data,data0 //kill the old data, if it exists 60 60 String cmd = "GBLoadWave/N=data/T={72,72}/O/S=4/W=1/U=16384 /Q \"" + fname +"\"" 61 61 Execute cmd 62 SetDataFolder root: MSK //make sure correct data folder is set63 WAVE data0 = $"root: MSK:data0"62 SetDataFolder root:Packages:NIST:MSK //make sure correct data folder is set 63 WAVE data0 = $"root:Packages:NIST:MSK:data0" 64 64 Redimension/N=(pixelsX,pixelsY) data0 65 65 Flip_Y(data0) 66 66 67 SetDataFolder root: MSK67 SetDataFolder root:Packages:NIST:MSK 68 68 Rename data0,data 69 69 70 Variable/G root: MSK:gIsLogScale = 071 String/G root: MSK:fileList = GetFileNameFromPathNoSemi(fname)70 Variable/G root:Packages:NIST:MSK:gIsLogScale = 0 71 String/G root:Packages:NIST:MSK:fileList = GetFileNameFromPathNoSemi(fname) 72 72 //back to root folder 73 73 SetDataFolder root: … … 153 153 Variable state 154 154 155 String maskPath = "root: MSK:data"155 String maskPath = "root:Packages:NIST:MSK:data" 156 156 if(WaveExists($maskPath) == 1) 157 157 //duplicate the mask, which is named "data" … … 159 159 Redimension/D root:MSK:overlay 160 160 161 String tempStr = "root: MSK:overlay"161 String tempStr = "root:Packages:NIST:MSK:overlay" 162 162 ResetLoop(tempStr) //keeps 1's and sets 0's to NaN 163 163 … … 168 168 endif 169 169 170 CheckDisplayed/W=SANS_Data root: MSK:overlay170 CheckDisplayed/W=SANS_Data root:Packages:NIST:MSK:overlay 171 171 //Print "V_flag = ",V_flag 172 172 … … 178 178 if(state==1) 179 179 //append the new overlay 180 AppendImage/L=left/B=bottom root: MSK:overlay180 AppendImage/L=left/B=bottom root:Packages:NIST:MSK:overlay 181 181 //set the color table to vary from 0 to * (=max data = 1), with blue maximum 182 182 //Nan's will appear transparent (just a general feature of images) … … 296 296 //there must be data in root:curDispType:data FIRST 297 297 SVAR curType=root:myGlobals:gDataDisplayType 298 if(WaveExists($("root: "+curType+":data") ))298 if(WaveExists($("root:Packages:NIST:"+curType+":data") )) 299 299 DoWindow/F drawMaskWin 300 300 If(V_flag == 0) … … 319 319 //create the data folder and the globals 320 320 NewDataFolder/O root:myGlobals:drawMask 321 Duplicate/O $("root: "+type+":data") root:myGlobals:drawMask:data //copy of the data321 Duplicate/O $("root:Packages:NIST:"+type+":data") root:myGlobals:drawMask:data //copy of the data 322 322 Endif 323 323 //if the data folder's there , then the globals must also be there so don't do anything -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_DataReadWrite.ipf
r412 r418 59 59 //VAX record markers are skipped as needed 60 60 //VAX data as read in is in compressed I*2 format, and is decompressed 61 //immediately after being read in. The final root: RAW:data wave is the real61 //immediately after being read in. The final root:Packages:NIST:RAW:data wave is the real 62 62 //neutron counts and can be directly operated on 63 63 // … … 78 78 String fname 79 79 //this function is for reading in RAW data only, so it will always put data in RAW folder 80 String curPath = "root: RAW"80 String curPath = "root:Packages:NIST:RAW" 81 81 SetDataFolder curPath //use the full path, so it will always work 82 82 Variable/G root:RAW:gIsLogScale = 0 //initial state is linear, keep this in RAW folder … … 85 85 String sansfname,textstr 86 86 87 Make/O/N=23 $"root: RAW:IntegersRead"88 Make/O/N=52 $"root: RAW:RealsRead"89 Make/O/T/N=11 $"root: RAW:TextRead"90 91 Wave intw=$"root: RAW:IntegersRead"92 Wave realw=$"root: RAW:RealsRead"93 Wave/T textw=$"root: RAW:TextRead"87 Make/O/N=23 $"root:Packages:NIST:RAW:IntegersRead" 88 Make/O/N=52 $"root:Packages:NIST:RAW:RealsRead" 89 Make/O/T/N=11 $"root:Packages:NIST:RAW:TextRead" 90 91 Wave intw=$"root:Packages:NIST:RAW:IntegersRead" 92 Wave realw=$"root:Packages:NIST:RAW:RealsRead" 93 Wave/T textw=$"root:Packages:NIST:RAW:TextRead" 94 94 95 95 //***NOTE **** … … 228 228 strToExecute = GBLoadStr + "/S=39/U=4" + "\"" + fname + "\"" 229 229 Execute strToExecute 230 Wave w=$"root: RAW:tempGBWave0"230 Wave w=$"root:Packages:NIST:RAW:tempGBWave0" 231 231 b=4 //num of reals read 232 232 realw[a,a+b-1] = w[p-a] … … 334 334 SetDataFolder curPath //use the full path, so it will always work 335 335 336 Make/O/N=16384 $"root: RAW:data"337 WAVE data=$"root: RAW:data"336 Make/O/N=16384 $"root:Packages:NIST:RAW:data" 337 WAVE data=$"root:Packages:NIST:RAW:data" 338 338 SkipAndDecompressVAX(w,data) 339 339 Redimension/N=(128,128) data //NIST raw data is 128x128 - do not generalize 340 340 341 341 //keep a string with the filename in the RAW folder 342 String/G root: RAW:fileList = textw[0]342 String/G root:Packages:NIST:RAW:fileList = textw[0] 343 343 344 344 //set the globals to the detector dimensions (pixels) … … 350 350 // endif 351 351 352 //clean up - get rid of w = $"root: RAW:tempGBWave0"352 //clean up - get rid of w = $"root:Packages:NIST:RAW:tempGBWave0" 353 353 KillWaves/Z w 354 354 … … 428 428 //main entry procedure for reading a "WORK.DIV" file 429 429 //displays a quick image of the file, to check that it's correct 430 //data is deposited in root: DIV data folder430 //data is deposited in root:Packages:NIST:DIV data folder 431 431 // 432 432 // local, currently unused … … 439 439 ReadHeaderAndWork("DIV",fname) //puts what is read in work.div 440 440 441 String waveStr = "root: DIV:data"441 String waveStr = "root:Packages:NIST:DIV:data" 442 442 NewImage/F/K=1/S=2 $waveStr //this is an experimental IGOR operation 443 443 ModifyImage '' ctab= {*,*,YellowHot,0} … … 445 445 446 446 //change the title string to WORK.DIV, rather than PLEXnnn_TST_asdfa garbage 447 String/G root: DIV:fileList = "WORK.DIV"447 String/G root:Packages:NIST:DIV:fileList = "WORK.DIV" 448 448 449 449 SetDataFolder root: //(redundant) … … 474 474 // SVAR cur_folder=root:myGlobals:gDataDisplayType 475 475 String cur_folder = type 476 String curPath = "root: "+cur_folder476 String curPath = "root:Packages:NIST:"+cur_folder 477 477 SetDataFolder curPath //use the full path, so it will always work 478 478 … … 728 728 GBLoadStr="GBLoadWave/O/N=tempGBwave/T={2,2}/J=2/W=1/Q" 729 729 730 curPath = "root: "+cur_folder730 curPath = "root:Packages:NIST:"+cur_folder 731 731 SetDataFolder curPath //use the full path, so it will always work 732 732 … … 828 828 String fname, destPath 829 829 //this function is for reading in ASCII data so put data in user-specified folder 830 SetDataFolder "root: "+destPath830 SetDataFolder "root:Packages:NIST:"+destPath 831 831 832 832 NVAR pixelsX = root:myGlobals:gNPixelsX … … 890 890 Function FillFakeHeader_ASC(destFolder) 891 891 String destFolder 892 Make/O/N=23 $("root: "+destFolder+":IntegersRead")893 Make/O/N=52 $("root: "+destFolder+":RealsRead")894 Make/O/T/N=11 $("root: "+destFolder+":TextRead")895 896 Wave intw=$("root: "+destFolder+":IntegersRead")897 Wave realw=$("root: "+destFolder+":RealsRead")898 Wave/T textw=$("root: "+destFolder+":TextRead")892 Make/O/N=23 $("root:Packages:NIST:"+destFolder+":IntegersRead") 893 Make/O/N=52 $("root:Packages:NIST:"+destFolder+":RealsRead") 894 Make/O/T/N=11 $("root:Packages:NIST:"+destFolder+":TextRead") 895 896 Wave intw=$("root:Packages:NIST:"+destFolder+":IntegersRead") 897 Wave realw=$("root:Packages:NIST:"+destFolder+":RealsRead") 898 Wave/T textw=$("root:Packages:NIST:"+destFolder+":TextRead") 899 899 900 900 //Put in appropriate "fake" values 901 901 //parse values as needed from headerLines 902 Wave/T hdr=$("root: "+destFolder+":hdrLines")902 Wave/T hdr=$("root:Packages:NIST:"+destFolder+":hdrLines") 903 903 Variable monCt,lam,offset,sdd,trans,thick 904 904 Variable xCtr,yCtr,a1,a2,a1a2Dist,dlam,bsDiam … … 951 951 // Print tempStr 952 952 // Print junkStr 953 String/G $("root: "+destFolder+":fileList") = tempStr953 String/G $("root:Packages:NIST:"+destFolder+":fileList") = tempStr 954 954 textw[0] = tempStr //filename 955 955 textw[1] = junkStr //run date-time -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProDiv.ipf
r412 r418 36 36 String type 37 37 38 Wave data=$("root: "+type+":data")38 Wave data=$("root:Packages:NIST:"+type+":data") 39 39 40 40 Variable refnum,ii=0,hdrBytes=516,a,b,offset … … 192 192 String type 193 193 194 WAVE data=$("root: "+type+":data")194 WAVE data=$("root:Packages:NIST:"+type+":data") 195 195 Variable totCts=sum(data,Inf,-Inf) //sum all of the data 196 196 … … 272 272 273 273 //do it crudely, with nested for loops 274 WAVE ctrData=$("root: "+ctrtype+":data")275 WAVE offData=$("root: "+offtype+":data")274 WAVE ctrData=$("root:Packages:NIST:"+ctrtype+":data") 275 WAVE offData=$("root:Packages:NIST:"+offtype+":data") 276 276 Variable ii,jj 277 277 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf
r412 r418 1375 1375 //fileList has NAMES ONLY - since it was derived from the file header 1376 1376 String testStr 1377 testStr = "root: "+type+":fileList"1377 testStr = "root:Packages:NIST:"+type+":fileList" 1378 1378 if(Exists(testStr) == 2) //2 if string variable exists 1379 1379 SVAR curFiles = $testStr … … 1616 1616 If(cmpstr(prot[1],"none") == 0) 1617 1617 //clean out the EMP folder? 1618 //KillDataFolder root: EMP1619 //NewDataFolder/O root: EMP1618 //KillDataFolder root:Packages:NIST:EMP 1619 //NewDataFolder/O root:Packages:NIST:EMP 1620 1620 break 1621 1621 Endif … … 1750 1750 Endif 1751 1751 //get the sample trans and thickness from the activeType folder 1752 String destStr = "root: "+activeType+":realsread"1752 String destStr = "root:Packages:NIST:"+activeType+":realsread" 1753 1753 Wave dest = $destStr 1754 1754 Variable c0 = dest[4] //sample transmission … … 1777 1777 //if none desired, make sure that the old mask is deleted 1778 1778 //junkStr = GetDataFolder(1) 1779 //SetDataFolder root: MSK1780 KillWaves/Z root: MSK:data1779 //SetDataFolder root:Packages:NIST:MSK 1780 KillWaves/Z root:Packages:NIST:MSK:data 1781 1781 //SetDataFolder junkStr 1782 1782 DoAlert 0,"No Mask file selected, data not masked" … … 1794 1794 //if none desired, make sure that the old mask is deleted 1795 1795 //junkStr = GetDataFolder(1) 1796 //SetDataFolder root: MSK1797 KillWaves/Z root: MSK:data1796 //SetDataFolder root:Packages:NIST:MSK 1797 KillWaves/Z root:Packages:NIST:MSK:data 1798 1798 //SetDataFolder junkStr 1799 1799 Endif … … 1863 1863 //then save 1864 1864 //get name from textwave of the activeType dataset 1865 String textStr = "root: "+activeType+":textread"1865 String textStr = "root:Packages:NIST:"+activeType+":textread" 1866 1866 Wave/T textPath = $textStr 1867 1867 If(WaveExists(textPath) == 1) … … 1994 1994 endif 1995 1995 1996 Wave/T tw=$"root: RAW:TextRead"1997 Wave rw=$"root: RAW:RealsRead"1998 Wave iw=$"root: RAW:IntegersRead"1996 Wave/T tw=$"root:Packages:NIST:RAW:TextRead" 1997 Wave rw=$"root:Packages:NIST:RAW:RealsRead" 1998 Wave iw=$"root:Packages:NIST:RAW:IntegersRead" 1999 1999 String acctStr = tw[3] 2000 2000 //NG5 attenuator transmission is assumed to be the same as the table for NG7 … … 2051 2051 //need the detector sensitivity file - make a guess, allow to override 2052 2052 String junkStr="" 2053 if(! waveexists($"root: DIV:data"))2053 if(! waveexists($"root:Packages:NIST:DIV:data")) 2054 2054 junkStr = PromptForPath("Select the detector sensitivity file") 2055 2055 If(strlen(junkStr)==0 || CheckIfRawData(junkStr)) //raw check==1 if RAW, DIV is not … … 2064 2064 Log_Lin("bisLog") 2065 2065 endif 2066 Wave divData = $"root: div:Data"2067 Wave data = $"root: raw:data" //this will be the linear data2066 Wave divData = $"root:Packages:NIST:div:Data" 2067 Wave data = $"root:Packages:NIST:raw:data" //this will be the linear data 2068 2068 // correct by detector sensitivity 2069 2069 data /= divData 2070 2070 2071 2071 // now do the sum, only in the box 2072 // detCnt = sum($"root: raw:data", -inf, inf )2072 // detCnt = sum($"root:Packages:NIST:raw:data", -inf, inf ) 2073 2073 // Print "box is now ",x1,x2,y1,y2 2074 2074 detCnt = SumCountsInBox(x1,x2,y1,y2,"RAW") -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/RawWindowHook.ipf
r412 r418 42 42 SVAR cur_folder=root:myGlobals:gDataDisplayType 43 43 SVAR cur_title = root:myGlobals:gCurTitle 44 String curPath = "root: "+cur_folder44 String curPath = "root:Packages:NIST:"+cur_folder 45 45 Wave/T tw=$(curPath+":TextRead") 46 46 cur_title = tw[6] //always update the title string … … 208 208 //get the current displayed data (so the correct folder is used) 209 209 SVAR cur_folder=root:myGlobals:gDataDisplayType 210 SetDataFolder "root: "+cur_folder //use the full path, so it will always work211 String curPath = "root: " + cur_folder210 SetDataFolder "root:Packages:NIST:"+cur_folder //use the full path, so it will always work 211 String curPath = "root:Packages:NIST:" + cur_folder 212 212 NVAR dataIsLog=$(curPath + ":gIsLogScale") //now a global variable in the current folder, not the globals folder 213 213 if (dataIsLog) … … 277 277 Variable dx,dy,thetax,thetay,qval,qx,qy 278 278 279 // Wave realW=$"root: raw:realsRead"279 // Wave realW=$"root:Packages:NIST:raw:realsRead" 280 280 // Variable pixSizeX = realW[10]/10 //header is in mm, want cm 281 281 // Variable pixSizeY = realW[13]/10 //header is in mm, want cm … … 307 307 //wavelength is in Angstroms 308 308 309 // Wave realW=$"root: raw:realsRead"309 // Wave realW=$"root:Packages:NIST:raw:realsRead" 310 310 // Variable pixSize = realW[10]/10 //header is in mm, want cm 311 311 … … 332 332 //wavelength is in Angstroms 333 333 334 // Wave realW=$"root: raw:realsRead"334 // Wave realW=$"root:Packages:NIST:raw:realsRead" 335 335 // Variable pixSize = realW[13]/10 //header is in mm, want cm 336 336 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/RectAnnulAvg.ipf
r412 r418 50 50 //type is the data type to do the averaging on, and will be set as the current folder 51 51 //get the current displayed data (so the correct folder is used) 52 String destPath = "root: "+type52 String destPath = "root:Packages:NIST:"+type 53 53 // 54 54 Variable xcenter,ycenter,x0,y0,sx,sx3,sy,sy3,dtsize,dtdist,dr,ddr … … 106 106 //Check for the existence of the mask, if not, make one (local to this folder) that is null 107 107 108 if(WaveExists($"root: MSK:data") == 0)108 if(WaveExists($"root:Packages:NIST:MSK:data") == 0) 109 109 Print "There is no mask file loaded (WaveExists)- the data is not masked" 110 110 Make/O/N=(pixelsX,pixelsY) $(destPath + ":mask") … … 112 112 mask = 0 113 113 else 114 Wave mask=$"root: MSK:data"114 Wave mask=$"root:Packages:NIST:MSK:data" 115 115 Endif 116 116 … … 459 459 //type is the data type to do the averaging on, and will be set as the current folder 460 460 //get the current displayed data (so the correct folder is used) 461 String destPath = "root: "+type461 String destPath = "root:Packages:NIST:"+type 462 462 463 463 Variable xcenter,ycenter,x0,y0,sx,sx3,sy,sy3,dtsize,dtdist … … 504 504 //Check for the existence of the mask, if not, make one (local to this folder) that is null 505 505 506 if(WaveExists($"root: MSK:data") == 0)506 if(WaveExists($"root:Packages:NIST:MSK:data") == 0) 507 507 Print "There is no mask file loaded (WaveExists)- the data is not masked" 508 508 Make/O/N=(pixelsX,pixelsY) $(destPath + ":mask") … … 510 510 mask = 0 511 511 else 512 Wave mask=$"root: MSK:data"512 Wave mask=$"root:Packages:NIST:MSK:data" 513 513 Endif 514 514 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SANS_Utilities.ipf
r412 r418 421 421 422 422 //not foolproof - will generage an error if any wavs, etc.. are in use. 423 KillDataFolder root: RAW424 KillDataFolder root: SAM425 KillDataFolder root: EMP426 KillDataFolder root: BGD427 KillDataFolder root: COR428 KillDataFolder root: DIV429 KillDataFolder root: MSK430 KillDataFolder root: ABS431 KillDataFolder root: CAL423 KillDataFolder root:Packages:NIST:RAW 424 KillDataFolder root:Packages:NIST:SAM 425 KillDataFolder root:Packages:NIST:EMP 426 KillDataFolder root:Packages:NIST:BGD 427 KillDataFolder root:Packages:NIST:COR 428 KillDataFolder root:Packages:NIST:DIV 429 KillDataFolder root:Packages:NIST:MSK 430 KillDataFolder root:Packages:NIST:ABS 431 KillDataFolder root:Packages:NIST:CAL 432 432 SetDataFolder root: 433 433 … … 440 440 String type 441 441 442 SetDataFolder $("root: "+type)442 SetDataFolder $("root:Packages:NIST:"+type) 443 443 KillWaves/A/Z 444 444 KillStrings/A/Z -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf
r412 r418 766 766 //type is the data type to do the averaging on, and will be set as the current folder 767 767 //get the current displayed data (so the correct folder is used) 768 String destPath = "root: "+type768 String destPath = "root:Packages:NIST:"+type 769 769 770 770 // -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Schematic.ipf
r412 r418 107 107 108 108 text2 = "Using Protocol: "+protocolName 109 text3 = "Sample file: "+ root: SAM:fileList109 text3 = "Sample file: "+ root:Packages:NIST:SAM:fileList 110 110 text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM") //trans and thickness of the sample 111 111 text5 += " d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm" … … 319 319 NVAR doLogScaling = root:myGlobals:gLogScalingAsDefault 320 320 321 wave data = $("root: "+type+":data")321 wave data = $("root:Packages:NIST:"+type+":data") 322 322 if(waveExists(data)) 323 323 PauseUpdate; Silent 1 // building window... … … 346 346 if(cmpstr(choice,"MSK overlay")==0) 347 347 nameStr = type+"MSK_PNG" 348 Duplicate/O root: MSK:data root:MSK:overlay349 Redimension/D root: MSK:overlay350 String tempStr = "root: MSK:overlay"348 Duplicate/O root:Packages:NIST:MSK:data root:MSK:overlay 349 Redimension/D root:Packages:NIST:MSK:overlay 350 String tempStr = "root:Packages:NIST:MSK:overlay" 351 351 ResetLoop(tempStr) 352 AppendImage root: MSK:overlay352 AppendImage root:Packages:NIST:MSK:overlay 353 353 ModifyImage overlay ctab={0,1,BlueRedGreen,0} 354 354 endif … … 363 363 ModifyGraph btLen=3 364 364 ModifyGraph tlOffset=-2 365 SVAR fileStr = $("root: "+type+":fileList")365 SVAR fileStr = $("root:Packages:NIST:"+type+":fileList") 366 366 Textbox/N=text0/F=0/A=MT/X=0.00/Y=0.00/E fileStr 367 367 … … 438 438 439 439 text2 = "Using Protocol: "+protocolName 440 text3 = "Sample file: "+ root: SAM:fileList440 text3 = "Sample file: "+ root:Packages:NIST:SAM:fileList 441 441 text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM") //trans and thickness of the sample 442 442 text5 += " d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm" … … 633 633 String type 634 634 635 String name="root: "+type+":realsread"635 String name="root:Packages:NIST:"+type+":realsread" 636 636 WAVE reals = $name 637 637 if(waveExists(reals)) … … 649 649 String type 650 650 651 String name="root: "+type+":realsread"651 String name="root:Packages:NIST:"+type+":realsread" 652 652 WAVE reals = $name 653 653 if(waveExists(reals)) … … 665 665 String type 666 666 667 String name="root: "+type+":realsread"667 String name="root:Packages:NIST:"+type+":realsread" 668 668 WAVE reals = $name 669 669 if(waveExists(reals)) -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Tile_2D.ipf
r412 r418 398 398 399 399 WAVE NIHColors = $"root:myGlobals:NIHColors" 400 WAVE data = $("root: "+type+":data")400 WAVE data = $("root:Packages:NIST:"+type+":data") 401 401 String nameStr = type +num2str(ii)+ "L_PNG" 402 402 … … 421 421 ModifyGraph btLen=3 422 422 ModifyGraph tlOffset=-2 423 SVAR fileStr = $("root: "+type+":fileList")423 SVAR fileStr = $("root:Packages:NIST:"+type+":fileList") 424 424 Textbox/N=text0/F=0/A=MT/X=0.00/Y=0.00/E fileStr 425 425 … … 578 578 String/G root:myGlobals:gDataDisplayType="RAW" 579 579 fRawWindowHook() 580 WAVE/T/Z tw = $"root: RAW:textRead" //to be sure that wave exists if no data was ever displayed580 WAVE/T/Z tw = $"root:Packages:NIST:RAW:textRead" //to be sure that wave exists if no data was ever displayed 581 581 newFileName= GetNameFromHeader(tw[0]) 582 582 -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Transmission.ipf
r412 r418 737 737 transCts = SumCountsInBox(x1,x2,y1,y2,"SAM") 738 738 // get the attenuator, lambda, and sample string (to get the instrument) 739 WAVE/T samText = $"root: SAM:textRead"740 WAVE samReals = $"root: SAM:realsRead"739 WAVE/T samText = $"root:Packages:NIST:SAM:textRead" 740 WAVE samReals = $"root:Packages:NIST:SAM:realsRead" 741 741 samfileStr = samText[3] 742 742 lambda = samReals[26] … … 846 846 transCts = SumCountsInBox(x1,x2,y1,y2,"SAM") 847 847 // get the attenuator, lambda, and sample string (to get the instrument) 848 WAVE/T samText = $"root: SAM:textRead"849 WAVE samReals = $"root: SAM:realsRead"848 WAVE/T samText = $"root:Packages:NIST:SAM:textRead" 849 WAVE samReals = $"root:Packages:NIST:SAM:realsRead" 850 850 samfileStr = samText[3] 851 851 lambda = samReals[26] … … 960 960 transCts = SumCountsInBox(0,pixelsX-1,0,pixelsY-1,"SAM") 961 961 // get the attenuator, lambda, and sample string (to get the instrument) 962 WAVE/T samText = $"root: SAM:textRead"963 WAVE samReals = $"root: SAM:realsRead"962 WAVE/T samText = $"root:Packages:NIST:SAM:textRead" 963 WAVE samReals = $"root:Packages:NIST:SAM:realsRead" 964 964 samfileStr = samText[3] 965 965 lambda = samReals[26] -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WorkFileUtils.ipf
r412 r418 63 63 64 64 // if the desired workfile doesn't exist, let the user know, and just make a new one 65 destPath = "root: "+newType + ":data"65 destPath = "root:Packages:NIST:"+newType + ":data" 66 66 if(WaveExists($destpath) == 0) 67 67 Print "There is no old work file to add to - a new one will be created" … … 72 72 73 73 //now make references to data in newType folder 74 DestPath="root: "+newType74 DestPath="root:Packages:NIST:"+newType 75 75 WAVE data=$(destPath +":data") // these wave references point to the EXISTING work data 76 76 WAVE/T textread=$(destPath + ":textread") … … 109 109 110 110 //DetCorr() has not been applied to the data in RAW , do it now in a local reference to the raw data 111 WAVE raw_data = $"root: RAW:data"112 WAVE raw_reals = $"root: RAW:realsread"113 WAVE/T raw_text = $"root: RAW:textread"114 WAVE raw_ints = $"root: RAW:integersread"111 WAVE raw_data = $"root:Packages:NIST:RAW:data" 112 WAVE raw_reals = $"root:Packages:NIST:RAW:realsread" 113 WAVE/T raw_text = $"root:Packages:NIST:RAW:textread" 114 WAVE raw_ints = $"root:Packages:NIST:RAW:integersread" 115 115 116 116 //check for log-scaling of the raw data - make sure it's linear … … 243 243 // replace with the contents of raw 244 244 245 destPath = "root: " + newType245 destPath = "root:Packages:NIST:" + newType 246 246 247 247 //check for log-scaling of the RAW data and adjust if necessary … … 250 250 251 251 //copy from current dir (RAW) to work, defined by destpath 252 DestPath = "root: "+newType253 Duplicate/O $"root: RAW:data",$(destPath + ":data")254 // Duplicate/O $"root: RAW:vlegend",$(destPath + ":vlegend")255 Duplicate/O $"root: RAW:textread",$(destPath + ":textread")256 Duplicate/O $"root: RAW:integersread",$(destPath + ":integersread")257 Duplicate/O $"root: RAW:realsread",$(destPath + ":realsread")252 DestPath = "root:Packages:NIST:"+newType 253 Duplicate/O $"root:Packages:NIST:RAW:data",$(destPath + ":data") 254 // Duplicate/O $"root:Packages:NIST:RAW:vlegend",$(destPath + ":vlegend") 255 Duplicate/O $"root:Packages:NIST:RAW:textread",$(destPath + ":textread") 256 Duplicate/O $"root:Packages:NIST:RAW:integersread",$(destPath + ":integersread") 257 Duplicate/O $"root:Packages:NIST:RAW:realsread",$(destPath + ":realsread") 258 258 Variable/G $(destPath + ":gIsLogscale")=0 //overwite flag in newType folder, data converted (above) to linear scale 259 259 … … 329 329 String type 330 330 331 WAVE reals=$("root: RAW:realsread")331 WAVE reals=$("root:Packages:NIST:RAW:realsread") 332 332 reals[1]=1 //true monitor counts, still in raw 333 333 Raw_to_work(type) 334 334 //data is now in "type" folder 335 WAVE data=$("root: "+type+":data")336 WAVE new_reals=$("root: "+type+":realsread")335 WAVE data=$("root:Packages:NIST:"+type+":data") 336 WAVE new_reals=$("root:Packages:NIST:"+type+":realsread") 337 337 338 338 Variable norm_mon,tot_mon,scale … … 355 355 String type 356 356 357 WAVE reals=$("root: RAW:realsread")357 WAVE reals=$("root:Packages:NIST:RAW:realsread") 358 358 reals[1]=1 //true monitor counts, still in raw 359 359 Add_Raw_to_work(type) 360 360 //data is now in "type" folder 361 WAVE data=$("root: "+type+":data")362 WAVE new_reals=$("root: "+type+":realsread")361 WAVE data=$("root:Packages:NIST:"+type+":data") 362 WAVE new_reals=$("root:Packages:NIST:"+type+":realsread") 363 363 364 364 Variable norm_mon,tot_mon,scale … … 747 747 // if the desired workfile doesn't exist, let the user know, and abort 748 748 String destPath="" 749 destPath = "root: "+Type + ":data"749 destPath = "root:Packages:NIST:"+Type + ":data" 750 750 if(WaveExists($destpath) == 0) 751 751 Print "There is no work file in "+type+"--Aborting" … … 754 754 //check for DIV 755 755 // if the DIV workfile doesn't exist, let the user know,and abort 756 destPath = "root: DIV:data"756 destPath = "root:Packages:NIST:DIV:data" 757 757 if(WaveExists($destpath) == 0) 758 758 Print "There is no work file in DIV --Aborting" … … 766 766 //copy type information to CAL, wiping out the old contents of the CAL folder first 767 767 768 //destPath = "root: CAL"768 //destPath = "root:Packages:NIST:CAL" 769 769 //SetDataFolder destPath 770 770 //KillWaves/A/Z //get rid of the old data in CAL folder … … 775 775 776 776 //copy from current dir (type)=destPath to CAL, overwriting CAL contents 777 destPath = "root: " + type778 Duplicate/O $(destPath + ":data"),$"root: CAL:data"779 // Duplicate/O $(destPath + ":vlegend"),$"root: CAL:vlegend"780 Duplicate/O $(destPath + ":textread"),$"root: CAL:textread"781 Duplicate/O $(destPath + ":integersread"),$"root: CAL:integersread"782 Duplicate/O $(destPath + ":realsread"),$"root: CAL:realsread"777 destPath = "root:Packages:NIST:" + type 778 Duplicate/O $(destPath + ":data"),$"root:Packages:NIST:CAL:data" 779 // Duplicate/O $(destPath + ":vlegend"),$"root:Packages:NIST:CAL:vlegend" 780 Duplicate/O $(destPath + ":textread"),$"root:Packages:NIST:CAL:textread" 781 Duplicate/O $(destPath + ":integersread"),$"root:Packages:NIST:CAL:integersread" 782 Duplicate/O $(destPath + ":realsread"),$"root:Packages:NIST:CAL:realsread" 783 783 //need to save a copy of filelist string too (from the current type folder) 784 784 SVAR oldFileList = $(destPath + ":fileList") 785 785 786 786 //now switch to reference waves in CAL folder 787 destPath = "root: CAL"787 destPath = "root:Packages:NIST:CAL" 788 788 //make appropriate wave references 789 789 Wave data=$(destPath + ":data") // these wave references point to the data in CAL … … 795 795 String/G $(destPath + ":fileList") = oldFileList 796 796 797 Wave div_data = $"root: DIV:data" //hard-wired in....797 Wave div_data = $"root:Packages:NIST:DIV:data" //hard-wired in.... 798 798 //do the division, changing data in CAL 799 799 data /= div_data … … 855 855 String destPath 856 856 //check for "type" 857 destPath = "root: "+Type + ":data"857 destPath = "root:Packages:NIST:"+Type + ":data" 858 858 if(WaveExists($destpath) == 0) 859 859 Print "There is no work file in "+type+"--Aborting" … … 861 861 Endif 862 862 //check for log-scaling of the "type" data and adjust if necessary 863 destPath = "root: "+Type863 destPath = "root:Packages:NIST:"+Type 864 864 NVAR gIsLogScale = $(destPath + ":gIsLogScale") 865 865 if(gIsLogScale) … … 872 872 //copy over the waves data,vlegend,text,integers,reals(read) 873 873 874 String oldType= "root: "+type //this is where the data to be absoluted is874 String oldType= "root:Packages:NIST:"+type //this is where the data to be absoluted is 875 875 //copy from current dir (type) to ABS, defined by destPath 876 Duplicate/O $(oldType + ":data"),$"root: ABS:data"877 // Duplicate/O $(oldType + ":vlegend"),$"root: ABS:vlegend"878 Duplicate/O $(oldType + ":textread"),$"root: ABS:textread"879 Duplicate/O $(oldType + ":integersread"),$"root: ABS:integersread"880 Duplicate/O $(oldType + ":realsread"),$"root: ABS:realsread"876 Duplicate/O $(oldType + ":data"),$"root:Packages:NIST:ABS:data" 877 // Duplicate/O $(oldType + ":vlegend"),$"root:Packages:NIST:ABS:vlegend" 878 Duplicate/O $(oldType + ":textread"),$"root:Packages:NIST:ABS:textread" 879 Duplicate/O $(oldType + ":integersread"),$"root:Packages:NIST:ABS:integersread" 880 Duplicate/O $(oldType + ":realsread"),$"root:Packages:NIST:ABS:realsread" 881 881 //need to save a copy of filelist string too (from the current type folder) 882 882 SVAR oldFileList = $(oldType + ":fileList") 883 883 //need to copy filelist string too 884 String/G $"root: ABS:fileList" = oldFileList884 String/G $"root:Packages:NIST:ABS:fileList" = oldFileList 885 885 886 886 //now switch to ABS folder 887 887 //make appropriate wave references 888 WAVE data=$"root: ABS:data" // these wave references point to the "type" data in ABS889 WAVE/T textread=$"root: ABS:textread" //that are to be directly operated on890 WAVE integersread=$"root: ABS:integersread"891 WAVE realsread=$"root: ABS:realsread"892 Variable/G $"root: ABS:gIsLogscale"=0 //make new flag in ABS folder, data is linear scale888 WAVE data=$"root:Packages:NIST:ABS:data" // these wave references point to the "type" data in ABS 889 WAVE/T textread=$"root:Packages:NIST:ABS:textread" //that are to be directly operated on 890 WAVE integersread=$"root:Packages:NIST:ABS:integersread" 891 WAVE realsread=$"root:Packages:NIST:ABS:realsread" 892 Variable/G $"root:Packages:NIST:ABS:gIsLogscale"=0 //make new flag in ABS folder, data is linear scale 893 893 894 894 //do the actual absolute scaling here, modifying the data in ABS … … 937 937 // if the desired workfile doesn't exist, let the user know, and abort 938 938 String destPath="" 939 destPath = "root: "+oldType + ":data"939 destPath = "root:Packages:NIST:"+oldType + ":data" 940 940 if(WaveExists($destpath) == 0) 941 941 Print "There is no work file in "+oldtype+"--Aborting" … … 949 949 950 950 //copy from current dir (type)=destPath to newtype, overwriting newtype contents 951 destPath = "root: " + oldtype952 Duplicate/O $(destPath + ":data"),$("root: "+newtype+":data")953 Duplicate/O $(destPath + ":textread"),$("root: "+newtype+":textread")954 Duplicate/O $(destPath + ":integersread"),$("root: "+newtype+":integersread")955 Duplicate/O $(destPath + ":realsread"),$("root: "+newtype+":realsread")951 destPath = "root:Packages:NIST:" + oldtype 952 Duplicate/O $(destPath + ":data"),$("root:Packages:NIST:"+newtype+":data") 953 Duplicate/O $(destPath + ":textread"),$("root:Packages:NIST:"+newtype+":textread") 954 Duplicate/O $(destPath + ":integersread"),$("root:Packages:NIST:"+newtype+":integersread") 955 Duplicate/O $(destPath + ":realsread"),$("root:Packages:NIST:"+newtype+":realsread") 956 956 //need to save a copy of filelist string too (from the current type folder) 957 957 SVAR oldFileList = $(destPath + ":fileList") 958 958 959 959 //now switch to reference waves in newtype folder 960 destPath = "root: "+newtype960 destPath = "root:Packages:NIST:"+newtype 961 961 Variable/G $(destPath + ":gIsLogScale")=0 //make new flag in newtype folder, data is linear scale 962 962 //need to copy filelist string too … … 1045 1045 NVAR pixelsY = root:myGlobals:gNPixelsY 1046 1046 1047 WAVE/Z data1=$("root: "+workMathStr+"File_1:data")1047 WAVE/Z data1=$("root:Packages:NIST:"+workMathStr+"File_1:data") 1048 1048 If(cmpstr(str2,"UNIT MATRIX")==0) 1049 1049 Make/O/N=(pixelsX,pixelsY) root:myGlobals:WorkMath:data //don't put in File_2 folder … … 1053 1053 //Load set #2 1054 1054 Load_NamedASC_File(pathStr+str2,workMathStr+"File_2") 1055 WAVE/Z data2=$("root: "+workMathStr+"File_2:data")1055 WAVE/Z data2=$("root:Packages:NIST:"+workMathStr+"File_2:data") 1056 1056 Endif 1057 1057 … … 1065 1065 //copy contents of str1 folder to dest and create the wave ref (it will exist) 1066 1066 CopyWorkContents(workMathStr+"File_1",workMathStr+dest) 1067 WAVE/Z destData=$("root: "+workMathStr+dest+":data")1067 WAVE/Z destData=$("root:Packages:NIST:"+workMathStr+dest+":data") 1068 1068 1069 1069 //dispatch … … 1229 1229 String type 1230 1230 1231 SetDataFolder $("root: "+type)1231 SetDataFolder $("root:Packages:NIST:"+type) 1232 1232 KillWaves/a/z 1233 1233 KillStrings/a/z -
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteQIS.ipf
r412 r418 20 20 21 21 String destStr="" 22 destStr = "root: "+type22 destStr = "root:Packages:NIST:"+type 23 23 24 24 Variable refNum … … 99 99 hdrStr2 += num2str(rw[25])+" "+num2str(rw[27])+" "+num2str(rw[21])+" "+textW[9] + "\r\n" 100 100 101 SVAR samFiles = $("root: "+type+":fileList")101 SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 102 102 //actually open the file here 103 103 Open refNum as fullpath … … 155 155 156 156 String destStr 157 destStr = "root: "+type157 destStr = "root:Packages:NIST:"+type 158 158 159 159 Variable refNum … … 218 218 hdrStr2 += num2str(rw[25])+" "+num2str(rw[27])+" "+num2str(rw[21])+" "+textW[9] + "\r\n" 219 219 220 SVAR samFiles = $("root: "+type+":fileList")220 SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 221 221 //actually open the file here 222 222 Open refNum as fullpath … … 290 290 print "type=",type 291 291 //graph the current data and save a little graph 292 Wave data = $("root: "+type+":data")292 Wave data = $("root:Packages:NIST:"+type+":data") 293 293 Wave q_x_axis = $"root:myGlobals:q_x_axis" 294 294 Wave q_y_axis = $"root:myGlobals:q_y_axis" … … 337 337 String destStr="",ave="C",typeStr="" 338 338 Variable step=1,refnum 339 destStr = "root: "+type339 destStr = "root:Packages:NIST:"+type 340 340 341 341 //must select the linear_data to export … … 364 364 Wave/T proto=$("root:myGlobals:Protocols:"+gProtoStr) 365 365 endif 366 SVAR samFiles = $("root: "+type+":fileList")366 SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 367 367 //check each wave - MUST exist, or will cause a crash 368 368 If(!(WaveExists(data))) … … 468 468 Variable refnum 469 469 470 destStr = "root: "+type470 destStr = "root:Packages:NIST:"+type 471 471 472 472 //must select the linear_data to export … … 643 643 String destStr="",typeStr="" 644 644 Variable step=1,refnum 645 destStr = "root: "+type645 destStr = "root:Packages:NIST:"+type 646 646 647 647 //must select the linear_data to export … … 669 669 Wave/T proto=$("root:myGlobals:Protocols:"+gProtoStr) 670 670 endif 671 SVAR samFiles = $("root: "+type+":fileList")671 SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 672 672 //check each wave - MUST exist, or will cause a crash 673 673 If(!(WaveExists(data)))
Note: See TracChangeset
for help on using the changeset viewer.