Changeset 1072 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Transmission.ipf

Timestamp:

Oct 31, 2017 1:09:55 PM (5 years ago)

Author:

srkline

Message:

a few changes to update the calculation of transmission values from the tables, and updating the correct units in a few places. Also updated how a transmission file is matched with a scattering file.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Transmission.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Transmission.ipf

@@ -87 +87 @@
                         WAVE groupIDW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Group_ID
                         WAVE transmW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Transmission
+                        WAVE/T intentW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Intent
                         
                         // TODO
@@ -105 +106 @@
                 // TODO x- set the popup string to the matching name on exit
                         Variable targetID = groupIDW[ii]
-                        String list = V_getFilePurposeList("TRANSMISSION",0)
+//                      String list = V_getFilePurposeList("TRANSMISSION",0)
+                        String list = V_getFileIntentPurposeList("SAMPLE","TRANSMISSION",0)
+                        
                         WAVE/T purposeW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Purpose
                         for(ii=0;ii<np;ii+=1)
-                                if(cmpstr(purposeW[ii],"TRANSMISSION")==0 && groupIDW[ii] == targetID)
+                                if(cmpstr(purposeW[ii],"TRANSMISSION")==0 && cmpstr(intentW[ii],"SAMPLE")==0 && groupIDW[ii] == targetID)
                                         Print "transmission file match at ",filenameW[ii]
                                         SetVariable setvar_2,value=labelW[ii]
                                         SetVariable setvar_3,value=groupIDW[ii]
-                                        PopupMenu popup_1,mode=WhichListItem(fileNameW[ii], list )+1
+                                        PopupMenu popup_1,mode=WhichListItem(fileNameW[ii], list )+1,popValue=fileNameW[ii]
                                         break
                                 endif           
@@ -122 +125 @@
                 // x-  Detector Panel field is hard-wired for "B"
                 //      
-                        WAVE/T intentW = root:Packages:NIST:VSANS:CatVSHeaderInfo:Intent
                         list = V_getFileIntentList("EMPTY BEAM",0)
                         
@@ -129 +131 @@
                                         Print "empty beam match at ",filenameW[ii]
                                         SetVariable setvar_4,value=labelW[ii]
-                                        PopupMenu popup_2,mode=WhichListItem(fileNameW[ii], list )+1
+                                        PopupMenu popup_2,mode=WhichListItem(fileNameW[ii], list )+1,popValue=fileNameW[ii]
                                         
 //                                      SetVariable setvar_6,value =_STR:"ML"