Changeset 391 for sans/Dev

Timestamp:

Jun 26, 2008 1:38:32 PM (15 years ago)

Author:

srkline

Message:

Lamellar_PS models now set the epsilon wave properly, and it doesn't get overwritten

Small fic to the wrapper to have better behavior with cursors. This issue is not done yet.

Location:

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models

Files:

• NewModels_2006/LamellarPS_HG_v40.ipf (modified) (2 diffs)
• NewModels_2006/LamellarPS_v40.ipf (modified) (2 diffs)
• Packages/Wrapper_v40.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LamellarPS_HG_v40.ipf

@@ -74 +74 @@
         // make epsilon wave appropriate for integer number of lamellar repeats
         Duplicate/O coef_LamellarPS_HG epsilon_LamellarPS_HG
-        epsilon_LamellarPS_HG = 1e-4
+        epsilon_LamellarPS_HG = 1e-4*coef_LamellarPS_HG
         epsilon_LamellarPS_HG[7] = 1            //to make the derivative useful 
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
@@ -113 +113 @@
         Label bottom "q (A\\S-1\\M)"
         Label left "I(q) (cm\\S-1\\M)"
+        
+        // make epsilon wave appropriate for integer number of lamellar repeats
+        Duplicate/O smear_coef_LamellarPS_HG epsilon_LamellarPS_HG
+        epsilon_LamellarPS_HG = 1e-4*smear_coef_LamellarPS_HG
+        epsilon_LamellarPS_HG[7] = 1            //to make the derivative useful 
         
         SetDataFolder root:

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LamellarPS_v40.ipf

@@ -74 +74 @@
         // make epsilon wave appropriate for integer number of lamellar repeats
         Duplicate/O coef_LamellarPS epsilon_LamellarPS
-        epsilon_LamellarPS = 1e-4
+        epsilon_LamellarPS = 1e-4*coef_LamellarPS
         epsilon_LamellarPS[6] = 1               //to make the derivative useful 
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
@@ -113 +113 @@
         Label bottom "q (A\\S-1\\M)"
         Label left "I(q) (cm\\S-1\\M)"
+        
+        // make epsilon wave appropriate for integer number of lamellar repeats
+        Duplicate/O smear_coef_LamellarPS epsilon_LamellarPS
+        epsilon_LamellarPS = 1e-4*smear_coef_LamellarPS
+        epsilon_LamellarPS[6] = 1               //to make the derivative useful 
         
         SetDataFolder root:

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

@@ -377 +377 @@
                                 Wave eps = $("epsilon_"+suffix)
                                 Wave coef=$popStr
-                                eps = abs(coef*1e-4) + 1e-10                    //default eps is proportional to the coefficients
+                                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
                         // default epsilon values, sometimes needed for the fit
@@ -451 +453 @@
         switch( pa.eventCode )
                 case 2: // mouse up
-//                      Variable popNum = pa.popNum
-//                      String funcStr = pa.popStr
-//                      String coefStr = W_CoefPopupList()
+                // make sure that the cursors are on/off appropriately
+                // check to make sure there really is a "topmost" graph         
+//                      String topGraph= WinName(0,1)   //this is the topmost graph
+//                      if(cmpstr(topGraph,"")==0)      //no graphs, uncheck and exit
+//                              CheckBox check_0,value=0
+//                      else
+//                              String ciStr = CsrInfo(A , topGraph)
+//                              
+//                              ControlInfo/W=wrapperpanel popup_0
+//                              String folderStr=S_Value
+//                              String traceList = TraceNameList(topGraph, ";", 1 )             
 //                      
-////                    Print "coefStr = ",coefStr
-//                      
-//                      ControlInfo/W=WrapperPanel popup_0
-//                      String folderStr=S_Value
-//                      
-//                      String listStr = W_CoefPopupList()
-//                      Variable num=WhichListItem(coefStr, listStr, ";")
-//                      String str=StringFromList(num, listStr  ,";")
-////                    print "str = ",str
-//                      //set the item in the coef popup, and pop it
-//                      PopupMenu popup_2 mode=(num+1)
-                        
+//                      endif
+                                                
+                        // then cascade the function/coefficient popups
                         Struct WMPopupAction ps
                         ps.eventCode = 2                //fake mouse up
@@ -779 +780 @@
         endif
 
+        // 20JUN if useCursors is true, and there are no cursors on the specified data set, uncheck and set to false
+        if(useCursors)
+                useCursors = AreCursorsCorrect(folderStr)
+        endif
         //if useCursors, and the data is USANS, need to recalculate the matrix if the range is new
         Variable pt1,pt2,newN,mPt1,mPt2
@@ -1231 +1236 @@
         return 0
 End
+
+// returns 1 if the specified data is on the top graph && has cursors on it
+// returns 0 and unchecks the box if anything is wrong
+//
+// only call this function if the cursor box is checked, to uncheck it as needed
+// if the box is unchecked, leave it be.
+//
+Function AreCursorsCorrect(folderStr)
+        String folderStr
+        
+        String topGraph= WinName(0,1)   //this is the topmost graph
+        if(cmpstr(topGraph,"")==0)      //no graphs, uncheck and exit
+                CheckBox check_0,win=wrapperpanel,value=0
+                return(0)
+        endif
+                
+        String traceAisOn = CsrWave(A , "", 0)
+        if(     strsearch(traceAisOn, folderStr, 0) == -1)              //data and cursors don't match
+                CheckBox check_0,win=wrapperpanel,value=0
+                return(0)
+        endif
+        
+        return(1)
+End