Changeset 734 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Sep 14, 2010 10:22:42 AM (13 years ago)

Author:

srkline

Message:

Fixed bug in maunUSANS panel where clicking in white space in the file list threw up an open file dialog.

ticket #292: 1D arithmetic panel now properly writes out USANS data, switching to fill in the USANS fields if the USANS_dQv variable is found. Otherwise it is treated as SANS data.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/WriteModelData_v40.ipf (modified) (1 diff)
• Common/DataSetHandling.ipf (modified) (2 diffs)
• Common/NIST_XML_v40.ipf (modified) (3 diffs)
• Reduction/USANS/Main_USANS.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/WriteModelData_v40.ipf

@@ -178 +178 @@
                 NVAR/Z dQv = USANS_dQv
                 if(NVAR_Exists(dQv) == 0)
+                        SetDataFolder root:
                         Abort "It's USANS data, and I don't know what the slit height is."
                 endif

sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf

@@ -1442 +1442 @@
         //If we are here, the folder (now) exists and the user has agreed to overwrite
         //either in the function call or from the alert.
+        
+        // here, GetIndexedObjectName copies all of the waves
+        index = 0
         do
                 objName = GetIndexedObjName(basestr,1,index)
@@ -1451 +1454 @@
                 index+=1
         while(1)
+
+// -- for USANS data, we need the slit height. copy all of the "USANS_*" variables
+// may need to augment this for other situations
+        index = 0
+        do
+                objName = GetIndexedObjName(basestr,2,index)
+                if (strlen(objName) == 0)
+                        break
+                endif
+                if(stringmatch(objName,"USANS*") == 1)
+                        objname = ":"+basestr+":"+objname
+                        NVAR tmp = $objName
+                        Variable/G $(ReplaceString(basestr,objName,newName))= tmp
+                endif
+                index+=1
+        while(1)
+        
 
         SetDataFolder root:

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -1003 +1003 @@
 /// See WriteModelData_v40.ipf for 6 column equivalent
 //
-// this only handles 6-column data, will abort if resolution wave is missing
+// will abort if resolution wave is missing
+// switches for USANS data if the proper global is found, otheriwse treats as SANS data
 //
 Function ReWrite1DXMLData(folderStr)
@@ -1038 +1039 @@
         endif
         
-        Duplicate/O qw qbar,sigQ,fs
-        sigq = resw[p][0]
-        qbar = resw[p][1]
-        fs = resw[p][2]
-
-                
-        //Data
-        Wave nf.Q = qw
-        nf.unitsQ = "1/A"
-        Wave nf.I = iw
-        nf.unitsI = "1/cm"
-        Wave nf.Idev = sw
-        nf.unitsIdev = "1/cm"
-        Wave nf.Qdev = sigQ
-        nf.unitsQdev = "1/A"
-        Wave nf.Qmean = qbar
-        nf.unitsQmean = "1/A"
-        Wave nf.Shadowfactor = fs
-        nf.unitsShadowfactor = "none"
-        
-        
-        //write out the standard header information
-        //fprintf refnum,"FILE: %s\t\t CREATED: %s\r\n",textw[0],textw[1]
-        
-        //AJJ to fix with sensible values
-        nf.run = ""
-        nf.nameSASinstrument = "NIST IGOR Procedures"
-        nf.SASnote = ""
-        //
-        nf.sample_ID = baseStr
-        nf.title = baseStr
-        nf.radiation = "neutron"
-        //Do something with beamstop (rw[21])
-        nf.detector_name = "Re-written data"
-
-        nf.SASprocessnote =  "Modified data written from folder "+baseStr+" on "+(date()+" "+time())
-        
-        nf.nameSASProcess = "NIST IGOR"
-
-        //Close refnum
+        
+        // if (USANS)
+        // else (SANS is assumed)
+        // endif
+        NVAR/Z dQv = USANS_dQv          // in current DF
+        if (NVAR_Exists(dQv))
+                //USANS data, proceed
+                //Use the evil extra column for the resolution "information". Should probably switch to using slit_length in collimation.
+                Duplicate/O qw,dumWave
+                dumWave = - dQv
+                
+                //Data
+                Wave nf.Q = qw
+                nf.unitsQ = "1/A"
+                Wave nf.I = iw
+                nf.unitsI = "1/cm"
+                Wave nf.Idev = sw
+                nf.unitsIdev = "1/cm"
+                // for slit-smeared USANS, set only a 4th column to  -dQv
+                Wave nf.dQl = dumWave
+                nf.unitsdQl= "1/A"
+        
+                //AJJ to fix with sensible values
+                nf.run = ""
+                nf.nameSASinstrument = "NIST IGOR Procedures"
+                nf.SASnote = ""
+                //
+                nf.sample_ID = baseStr
+                nf.title = baseStr
+                nf.radiation = "neutron"
+                //Do something with beamstop (rw[21])
+                nf.detector_name = "Re-written USANS data"
+        
+                nf.SASprocessnote =  "Modified data written from folder "+baseStr+" on "+(date()+" "+time())
+                
+                nf.nameSASProcess = "NIST IGOR"
+                
+        else
+                //assume SANS data
+                Duplicate/O qw qbar,sigQ,fs
+                sigq = resw[p][0]
+                qbar = resw[p][1]
+                fs = resw[p][2]
+        
+                        
+                //Data
+                Wave nf.Q = qw
+                nf.unitsQ = "1/A"
+                Wave nf.I = iw
+                nf.unitsI = "1/cm"
+                Wave nf.Idev = sw
+                nf.unitsIdev = "1/cm"
+                Wave nf.Qdev = sigQ
+                nf.unitsQdev = "1/A"
+                Wave nf.Qmean = qbar
+                nf.unitsQmean = "1/A"
+                Wave nf.Shadowfactor = fs
+                nf.unitsShadowfactor = "none"
+                
+                
+                //write out the standard header information
+                //fprintf refnum,"FILE: %s\t\t CREATED: %s\r\n",textw[0],textw[1]
+                
+                //AJJ to fix with sensible values
+                nf.run = ""
+                nf.nameSASinstrument = "NIST IGOR Procedures"
+                nf.SASnote = ""
+                //
+                nf.sample_ID = baseStr
+                nf.title = baseStr
+                nf.radiation = "neutron"
+                //Do something with beamstop (rw[21])
+                nf.detector_name = "Re-written data"
+        
+                nf.SASprocessnote =  "Modified data written from folder "+baseStr+" on "+(date()+" "+time())
+                
+                nf.nameSASProcess = "NIST IGOR"
+
+        endif
+
         
         if(dialog)
@@ -1095 +1136 @@
         Print "XML File written: ", GetFileNameFromPathNoSemi(fullPath)
         KillWaves/Z tempShortProto
+        
+        SetDataFolder root:
+
         Return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

@@ -620 +620 @@
         endif
         //Print fname
-        if(strlen(fileWave[ii]) > 0)            //make sure that this is not a click in blank space
+        if(strlen(fileWave[ii]) > 0 && ii < numpnts(fileWave))          //make sure that this is not a click in blank space
                 err = LoadBT5File(fname,"RAW")
                 if(err)
@@ -706 +706 @@
         endif           
         //Print fname
-        if(strlen(fileWave[ii]) > 0)            //make sure that this is not a click in blank space
+        if(strlen(fileWave[ii]) > 0 && ii < numpnts(fileWave))          //make sure that this is not a click in blank space
                 ReadBT5Header(fname)
         endif