Changeset 1188 for sans

Timestamp:

Jul 29, 2019 11:14:26 AM (4 years ago)

Author:

srkline

Message:

increasing setVariable control size on the masking panel so that the sector parameters are more visible on windows computers.

Added the capability to save smoothed (not desmeared) data files from the USANs desmearing panel. These smoothed data files are re-saved with the -dQv value that they were loaded with, since they are still smeared USANS data sets. They are saved with the ".smth" extension.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• USANS/LakeDesmearing_JB.ipf (modified) (3 diffs)
• VSANS/V_MaskUtils.ipf (modified) (1 diff)

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

@@ -608 +608 @@
         Return(0)
 End
+
+
+// since this data is only smoothed, repeat the three fake resolution columns with the
+// negative value for the dQv value
+//
+// SRK 29 JUL 2019
+//
+Function WriteUSANS_Smoothed(fullpath,lo,hi,dialog)
+        String fullpath
+        Variable lo,hi,dialog           //=1 will present dialog for name
+        
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
+        String termStr="\r\n"
+        String destStr = USANSFolder+":DSM:"
+        String formatStr = "%15.6g %15.6g %15.6g %15.6g %15.6g %15.6g"+termStr
+        
+        Variable refNum,integer,realval
+        NVAR gDQV = root:Packages:NIST:USANS:DSM:gDqv
+        
+        //*****these waves MUST EXIST, or IGOR Pro will crash, with a type 2 error****
+        WAVE Q_smth =$(destStr + "Q_smth")
+        WAVE I_smth=$(destStr + "I_smth")
+        WAVE S_smth=$(destStr + "S_smth")
+        
+        //check each wave
+        If(!(WaveExists(Q_smth)))
+                Abort "Q_smth DNExist in WriteUSANS_Smoothed()"
+        Endif
+        If(!(WaveExists(I_smth)))
+                Abort "I_smth DNExist in WriteUSANS_Smoothed()"
+        Endif
+        If(!(WaveExists(S_smth)))
+                Abort "S_smth DNExist in WriteUSANS_Smoothed()"
+        Endif
+        
+        // 06 FEB 06 SRK
+        // make dummy waves to hold the "fake" resolution, and write it as the last 3 columns
+        //
+        Duplicate/O Q_smth,res1,res2,res3
+        res1 = -gDQV
+        res2 = -gDQV
+        res3 = -gDQV
+        
+        if(dialog)
+                Open/D refnum as fullpath+".smth"               //won't actually open the file
+                If(cmpstr(S_filename,"")==0)
+                        //user cancel, don't write out a file
+                        Close/A
+                        Abort "no data file was written"
+                Endif
+                fullpath = S_filename
+        Endif
+        
+        //write out partial set?
+        Duplicate/O Q_smth,tq,ti,te
+        ti=I_smth
+        te=S_smth
+        if( (lo!=hi) && (lo<hi))
+                redimension/N=(hi-lo+1) tq,ti,te,res1,res2,res3         //lo to hi, inclusive
+                tq=Q_smth[p+lo]
+                ti=I_smth[p+lo]
+                te=S_smth[p+lo]
+        endif
+        
+        //tailor the output given the type of data written out...
+        String samStr="",dateStr="",str1,str2
+
+        //get the number of spline passes from the wave note
+        String noteStr
+        Variable boxPass,SplinePass
+        noteStr=note(I_smth)
+        BoxPass = NumberByKey("BOX", noteStr, "=", ";")
+        splinePass = NumberByKey("SPLINE", noteStr, "=", ";")
+        
+
+        samStr = fullpath
+        dateStr="CREATED: "+date()+" at  "+time()
+//      sprintf str1,"Chi^2 = %g   PowerLaw m = %4.2f   Iterations = %d",chiFinal,m,iter
+        str1 = "smoothed data file, not desmeared"
+        sprintf str2,"%d box smooth passes and %d smoothing spline passes",boxPass,splinePass
+
+        
+        //actually open the file
+        Open refNum as fullpath
+        
+        fprintf refnum,"%s"+termStr,samStr
+//      fprintf refnum,"%s"+termStr,str1
+        fprintf refnum,"%s"+termStr,str2
+        fprintf refnum,"%s"+termStr,dateStr
+        
+        wfprintf refnum, formatStr, tq,ti,te,res1,res2,res3
+        
+        Close refnum
+        
+        Killwaves/Z ti,tq,te,res1,res2,res3
+        
+        Return(0)
+End
+
 
 /// procedures to do the extrapolation to high Q
@@ -1559 +1659 @@
         ControlInfo/W=Desmear_Graph DSMControl_3c               //SSCheck
         if(V_value == 1)
-//              Interpolate2/T=3/N=(nq)/I=2/F=1/SWAV=S_ext/Y=Yi_SS/X=Yq_SS Q_ext, I_ext         //Igor 5
+                nq_ext = numpnts(Q_ext)
+                Interpolate2/T=3/N=(nq_ext)/I=2/F=1/SWAV=S_ext/Y=Yi_SS/X=Yq_SS Q_ext, I_ext             //Igor 5
 //              Interpolate/T=3/N=(nq)/I=2/F=1/S=S_ext/Y=Yi_SS/X=Yq_SS I_ext /X=Q_ext                   //Igor 4
-        //Igor 4
-                String str=""
-                nq_ext = numpnts(Q_ext)
-                str = "Interpolate/T=3/N=("+num2str(nq_ext)+")/I=1/F=("+num2str(sParam)+")/Y=Yi_SS/X=Yq_SS I_ext /X=Q_ext"              
-                Execute str
+//      //Igor 4
+//              String str=""
+//              nq_ext = numpnts(Q_ext)
+//              str = "Interpolate/T=3/N=("+num2str(nq_ext)+")/I=1/F=("+num2str(sParam)+")/Y=Yi_SS/X=Yq_SS I_ext /X=Q_ext"              
+//              Execute str
 //              Print Str
+        // end Igor 4   
 //              Interpolate2/T=3/N=(nq_ext)/I=1/F=(sParam)/Y=Yi_SS/X=Yq_SS Q_ext, I_ext
-        // end Igor 4   
+
                 wave yi_ss = yi_ss              // already in the right DF
                 wave yq_ss = yq_ss
@@ -1673 +1775 @@
         //
 
-        if (useXMLOutput == 1)  
-                WriteXMLUSANSDesmeared(saveStr,0,0,1)
-        else
-                WriteUSANSDesmeared(saveStr,0,0,1)                      //use the full set (lo=hi=0) and present a dialog
-        endif
+        ControlInfo DSM_Tab
+        Variable curTab = V_Value
+        
+        switch(curTab)  // numeric switch
+                case 4: // data from the desmeared data tab
+                        if (useXMLOutput == 1)  
+                                WriteXMLUSANSDesmeared(saveStr,0,0,1)
+                        else
+                                WriteUSANSDesmeared(saveStr,0,0,1)                      //use the full set (lo=hi=0) and present a dialog
+                        endif
+                        break   
+                case 3: 
+                                WriteUSANS_Smoothed(saveStr,0,0,1)
+                        break
+                default:                        
+                        DoAlert 0,"Can only save data from the smooth or desmeared tabs"
+        endswitch
+
+
         
         SetDataFolder root:

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

@@ -1132 +1132 @@
         Button button4,pos={720.00,10.00},size={25.00,20.00},proc=V_AvgPanelHelpButtonProc,title="?"
 
-        SetVariable setvar0,pos={50,40},size={140,23},title="Annulus q-center (A)"
+        SetVariable setvar0,pos={20,40},size={160,23},title="Annulus q-center (A)"
         SetVariable setvar0,limits={0,1,0.001},value=root:Packages:NIST:VSANS:Globals:Mask:gAnnularQCtr
-        SetVariable setvar1,pos={50,70},size={140,23},title="Annulus (+/-) q (A)"
+        SetVariable setvar1,pos={20,70},size={160,23},title="Annulus (+/-) q (A)"
         SetVariable setvar1,limits={0,1,0.001},value=root:Packages:NIST:VSANS:Globals:Mask:gAnnularDQ
-        SetVariable setvar2,pos={200,40},size={140,23},title="Sector Angle (deg)"
+        SetVariable setvar2,pos={190,40},size={150,23},title="Sector Angle (deg)"
         SetVariable setvar2,limits={-90,90,1},value=root:Packages:NIST:VSANS:Globals:Mask:gSectorAngle
-        SetVariable setvar3,pos={200,70},size={140,23},title="Sector (+/-) (deg)"
+        SetVariable setvar3,pos={190,70},size={150,23},title="Sector (+/-) (deg)"
         SetVariable setvar3,limits={0,90,1},value=root:Packages:NIST:VSANS:Globals:Mask:gSectorDQ