Changeset 1222 for sans/Dev/trunk/NCNR_User_Procedures/Analysis

Timestamp:

Oct 18, 2019 1:08:35 PM (3 years ago)

Author:

srkline

Message:

Updated help file for VSANS. Graphics were not PNG.

Removed HFIR SANS package since if requires XML XOP - no longer supported.

Improved quality of graphics export for Analysis reports.

Added more support for super_white_beam mode on VSANS

Corrected printf bug (Igor 8) when printing out % sign

Added utilities for patching wavelength and monochromator type on VSANS since the type is still not written out correctly by NICE, and super_white_beam is not yet defined in NICE

Adjusted panel dimensions for the temperature sensor display on VSANS (needed onWindows)

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis

Files:

• Packages/Wrapper_v40.ipf (modified) (3 diffs)
• VSANS/V_SWB_Beaucage.ipf (modified) (12 diffs)
• VSANS/V_SWB_BroadPeak.ipf (modified) (3 diffs)
• VSANS/V_SWB_GaussSpheres.ipf (modified) (3 diffs)
• VSANS/V_WB_Beaucage.ipf (modified) (12 diffs)
• VSANS/V_WB_BroadPeak.ipf (modified) (3 diffs)
• VSANS/V_WB_GaussSpheres.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

@@ -345 +345 @@
                         // make the necessary waves if they don't exist already
                         if(exists("Hold_"+suffix) == 0)
-                                Make/O/D/N=(num) $("epsilon_"+suffix),$("Hold_"+suffix)
-                                Make/O/T/N=(num) $("LoLim_"+suffix),$("HiLim_"+suffix)
-                                Wave eps = $("epsilon_"+suffix)
-                                Wave coef=$popStr
-                                if(eps[0] == 0)         //if eps already if filled, don't change it
-                                        eps = abs(coef*1e-4) + 1e-10                    //default eps is proportional to the coefficients
-                                endif
-                        endif
+                                Make/O/D/N=(num) $("Hold_"+suffix)
+                        endif
+                        if(exists("epsilon_"+suffix) == 0)
+                                Make/O/D/N=(num) $("epsilon_"+suffix)
+                        endif
+                        if(exists("LoLim_"+suffix) == 0)
+                                Make/O/T/N=(num) $("LoLim_"+suffix)
+                        endif
+                        if(exists("HiLim_"+suffix) == 0)
+                                Make/O/T/N=(num) $("HiLim_"+suffix)
+                        endif
+                                                
+                        Wave eps = $("epsilon_"+suffix)
+                        Wave coef=$popStr
+                        if(eps[0] == 0)         //if eps already if filled, don't change it
+                                eps = abs(coef*1e-4) + 1e-10                    //default eps is proportional to the coefficients
+                        endif
+                        
                         // default epsilon values, sometimes needed for the fit
                         
@@ -1169 +1179 @@
         
         // insert graphs
+        // extra flag "2" (Igor >=7.00) is 2x screen resolution
         if(WaveExists(dataXw))
 //              Notebook $nb picture={$topGraph(0, 0, 400, 300), -5, 1}, text="\r"
-                Notebook $nb scaling={50, 50}, picture={$topGraph(0, 0, 800, 600), -5, 1}, text="\r"
+                Notebook $nb scaling={50, 50}, picture={$topGraph(0, 0, 800, 600), -5, 1,2}, text="\r"
         //
         else            //must be 2D Gizmo
                 Execute "ExportGizmo Clip"                      //this ALWAYS is a PICT or BMP. Gizmo windows are different...
                 LoadPict/Q/O "Clipboard",tmp_Gizmo
-                Notebook $nb picture={tmp_Gizmo(0, 0, 800, 600), 0, 1}, text="\r"
+                Notebook $nb picture={tmp_Gizmo(0, 0, 800, 600), 0, 1,2}, text="\r"
         endif
         
@@ -1211 +1222 @@
 ///             SavePICT /E=-5/O/P=home /I/W=(0,0,3,3) as pictStr
                 if(WaveExists(dataXw))
-                        SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,800,600) as pictStr
+                        SavePICT /E=-5/O/B=144/P=home/WIN=$topGraph /W=(0,0,800,600) as pictStr
                 else
                         Execute "ExportGizmo /P=home as \""+pictStr+"\""                //this won't be of very high quality

sans/Dev/trunk/NCNR_User_Procedures/Analysis/VSANS/V_SWB_Beaucage.ipf

@@ -278 +278 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 20/5.3
+        loLim = 3.37/kSuperWhiteBeam_Mean
+        upLim = 20/kSuperWhiteBeam_Mean
         
         inten = V_IntegrOneLevelSWB_mid(w,loLim,upLim,x)
@@ -285 +285 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kSuperWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 30955          // "middle"  of peaks
+        inten /= kSuperWhiteBeam_Normalization          // "middle"  of peaks
 
 // additional normalization???
@@ -321 +321 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_SuperWhiteBeamDist_mid(dum*5.3)*OneLevelX(cw,qq/dum)
+        val = V_SuperWhiteBeamDist_mid(dum*kSuperWhiteBeam_Mean)*OneLevelX(cw,qq/dum)
         
         return (val)
@@ -350 +350 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 20/5.3
+        loLim = 3.37/kSuperWhiteBeam_Mean
+        upLim = 20/kSuperWhiteBeam_Mean
         
         inten = V_IntegrTwoLevelSWB_mid(w,loLim,upLim,x)
@@ -357 +357 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kSuperWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 30955          // "middle"  of peaks
+        inten /= kSuperWhiteBeam_Normalization          // "middle"  of peaks
 
 // additional normalization???
@@ -393 +393 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_SuperWhiteBeamDist_mid(dum*5.3)*TwoLevelX(cw,qq/dum)
+        val = V_SuperWhiteBeamDist_mid(dum*kSuperWhiteBeam_Mean)*TwoLevelX(cw,qq/dum)
         
         return (val)
@@ -422 +422 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 20/5.3
+        loLim = 3.37/kSuperWhiteBeam_Mean
+        upLim = 20/kSuperWhiteBeam_Mean
         
         inten = V_IntegrThreeLevelSWB_mid(w,loLim,upLim,x)
@@ -429 +429 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kSuperWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 30955          // "middle"  of peaks
+        inten /= kSuperWhiteBeam_Normalization          // "middle"  of peaks
 
 // additional normalization???
@@ -465 +465 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_SuperWhiteBeamDist_mid(dum*5.3)*ThreeLevelX(cw,qq/dum)
+        val = V_SuperWhiteBeamDist_mid(dum*kSuperWhiteBeam_Mean)*ThreeLevelX(cw,qq/dum)
         
         return (val)
@@ -496 +496 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 20/5.3
+        loLim = 3.37/kSuperWhiteBeam_Mean
+        upLim = 20/kSuperWhiteBeam_Mean
         
         inten = V_IntegrFourLevelSWB_mid(w,loLim,upLim,x)
@@ -503 +503 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kSuperWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 30955          // "middle"  of peaks
+        inten /= kSuperWhiteBeam_Normalization          // "middle"  of peaks
 
 // additional normalization???
@@ -539 +539 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_SuperWhiteBeamDist_mid(dum*5.3)*FourLevelX(cw,qq/dum)
+        val = V_SuperWhiteBeamDist_mid(dum*kSuperWhiteBeam_Mean)*FourLevelX(cw,qq/dum)
         
         return (val)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/VSANS/V_SWB_BroadPeak.ipf

@@ -124 +124 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 20/5.3
+        loLim = 3.37/kSuperWhiteBeam_Mean
+        upLim = 20/kSuperWhiteBeam_Mean
         
         inten = V_IntegrBroadPeakSWB_mid(w,loLim,upLim,x)
@@ -133 +133 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kSuperWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 30955          // "middle"  of peaks
+        inten /= kSuperWhiteBeam_Normalization          // "middle"  of peaks
 
         inten -= w[6]
@@ -176 +176 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_SuperWhiteBeamDist_mid(dum*5.3)*BroadPeakX(cw,qq/dum)
+        val = V_SuperWhiteBeamDist_mid(dum*kSuperWhiteBeam_Mean)*BroadPeakX(cw,qq/dum)
         
         return (val)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/VSANS/V_SWB_GaussSpheres.ipf

@@ -121 +121 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 20/5.3
+        loLim = 3.37/kSuperWhiteBeam_Mean
+        upLim = 20/kSuperWhiteBeam_Mean
         
         inten = V_IntegrGaussSphereSWB_mid(w,loLim,upLim,xx)
@@ -128 +128 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kSuperWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 30955          // "middle"  of peaks
+        inten /= kSuperWhiteBeam_Normalization          // "middle"  of peaks
 
         inten -= w[5]
@@ -169 +169 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_SuperWhiteBeamDist_mid(dum*5.3)*GaussSpheresX(cw,qq/dum)
+        val = V_SuperWhiteBeamDist_mid(dum*kSuperWhiteBeam_Mean)*GaussSpheresX(cw,qq/dum)
         
         return (val)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/VSANS/V_WB_Beaucage.ipf

@@ -278 +278 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 8.37/5.3
+        loLim = 3.37/kWhiteBeam_Mean
+        upLim = 8.37/kWhiteBeam_Mean
         
         inten = V_IntegrOneLevelWB_mid(w,loLim,upLim,x)
@@ -285 +285 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 19933          // "middle"  of peaks
+        inten /= kWhiteBeam_Normalization               // "middle"  of peaks
 
 // additional normalization???
@@ -321 +321 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_WhiteBeamDist_mid(dum*5.3)*OneLevelX(cw,qq/dum)
+        val = V_WhiteBeamDist_mid(dum*kWhiteBeam_Mean)*OneLevelX(cw,qq/dum)
         
         return (val)
@@ -350 +350 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 8.37/5.3
+        loLim = 3.37/kWhiteBeam_Mean
+        upLim = 8.37/kWhiteBeam_Mean
         
         inten = V_IntegrTwoLevelWB_mid(w,loLim,upLim,x)
@@ -357 +357 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 19933          // "middle"  of peaks
+        inten /= kWhiteBeam_Normalization               // "middle"  of peaks
 
 // additional normalization???
@@ -393 +393 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_WhiteBeamDist_mid(dum*5.3)*TwoLevelX(cw,qq/dum)
+        val = V_WhiteBeamDist_mid(dum*kWhiteBeam_Mean)*TwoLevelX(cw,qq/dum)
         
         return (val)
@@ -422 +422 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 8.37/5.3
+        loLim = 3.37/kWhiteBeam_Mean
+        upLim = 8.37/kWhiteBeam_Mean
         
         inten = V_IntegrThreeLevelWB_mid(w,loLim,upLim,x)
@@ -429 +429 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 19933          // "middle"  of peaks
+        inten /= kWhiteBeam_Normalization               // "middle"  of peaks
 
 // additional normalization???
@@ -465 +465 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_WhiteBeamDist_mid(dum*5.3)*ThreeLevelX(cw,qq/dum)
+        val = V_WhiteBeamDist_mid(dum*kWhiteBeam_Mean)*ThreeLevelX(cw,qq/dum)
         
         return (val)
@@ -496 +496 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 8.37/5.3
+        loLim = 3.37/kWhiteBeam_Mean
+        upLim = 8.37/kWhiteBeam_Mean
         
         inten = V_IntegrFourLevelWB_mid(w,loLim,upLim,x)
@@ -503 +503 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 19933          // "middle"  of peaks
+        inten /= kWhiteBeam_Normalization               // "middle"  of peaks
 
 // additional normalization???
@@ -539 +539 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_WhiteBeamDist_mid(dum*5.3)*FourLevelX(cw,qq/dum)
+        val = V_WhiteBeamDist_mid(dum*kWhiteBeam_Mean)*FourLevelX(cw,qq/dum)
         
         return (val)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/VSANS/V_WB_BroadPeak.ipf

@@ -121 +121 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 8.37/5.3
+        loLim = 3.37/kWhiteBeam_Mean
+        upLim = 8.37/kWhiteBeam_Mean
         
         inten = V_IntegrBroadPeakWB_mid(w,loLim,upLim,x)
@@ -128 +128 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 19933          // "middle"  of peaks
+        inten /= kWhiteBeam_Normalization               // "middle"  of peaks
 
 // additional normalization???
@@ -164 +164 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_WhiteBeamDist_mid(dum*5.3)*BroadPeakX(cw,qq/dum)
+        val = V_WhiteBeamDist_mid(dum*kWhiteBeam_Mean)*BroadPeakX(cw,qq/dum)
         
         return (val)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/VSANS/V_WB_GaussSpheres.ipf

@@ -121 +121 @@
         // define limits based on lo/mean, hi/mean of the wavelength distribution
         // using the empirical definition, "middle" of the peaks
-        loLim = 3.37/5.3
-        upLim = 8.37/5.3
+        loLim = 3.37/kWhiteBeam_Mean
+        upLim = 8.37/kWhiteBeam_Mean
         
         inten = V_IntegrGaussSphereWB_mid(w,loLim,upLim,xx)
@@ -128 +128 @@
 // why do I need this? Is this because this is defined as the mean of the distribution
 //  and is needed to normalize the integral? verify this on paper.      
-        inten *= 5.3
+        inten *= kWhiteBeam_Mean
 
 // normalize the integral       
-        inten /= 19933          // "middle"  of peaks
+        inten /= kWhiteBeam_Normalization               // "middle"  of peaks
 
         inten -= w[5]
@@ -167 +167 @@
 //      FUNCREF SANSModel_proto func = $funcStr
 
-        val = V_WhiteBeamDist_mid(dum*5.3)*GaussSpheresX(cw,qq/dum)
+        val = V_WhiteBeamDist_mid(dum*kWhiteBeam_Mean)*GaussSpheresX(cw,qq/dum)
         
         return (val)