Changeset 173

Timestamp:

Oct 1, 2007 1:44:11 PM (15 years ago)

Author:

srkline

Message:

Included a simple report generator (always generates a report, no automatic save) for the GlobalFit? routine. The WM report to the command window is captured and sent to a notebook to create a report similar to the FitWrapper?.

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages

Files:

• GlobalFit/GlobalFit2_NCNR.ipf (modified) (4 diffs)
• Wrapper.ipf (modified) (1 diff)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/GlobalFit/GlobalFit2_NCNR.ipf

@@ -806 +806 @@
         Duplicate/O MasterCoefs, GlobalFitCoefficients
         
-
+        Variable histNum=CaptureHistoryStart()          //SRK - for my report
         if (!quiet)
-                Print "\rGlobal fit results"
+                Print "Global fit results"
                 if(V_FitError)
                                 print "\tFit stopped due to an error:"
@@ -846 +846 @@
                 Variable firstUserow, firstUsecol, linkIndex
                 Wave W_sigma = root:Packages:NewGlobalFit:W_sigma
+                //SRK - adjusting the report format
+//              for (i = 0; i < numRows; i += 1)
+//                      print "Data Set: ",DataSets[i][0]," vs ",DataSets[i][1],"; Function: ",FitFuncNames[privateLinkage[i][FuncPointerCol]]
+//                      for (j = FirstCoefCol; j < (privateLinkage[i][NumFuncCoefsCol] + FirstCoefCol); j += 1)
+//                              linkIndex = privateLinkage[i][j]
+//                              
+//                              FirstUseOfIndexInLinkMatrix(linkIndex, privateLinkage, firstUserow, firstUsecol)
+//                              printf "\t%d\t%s\t%g +- %g", j-FirstCoefCol, CoefNames[privateLinkage[i][j]], MasterCoefs[privateLinkage[i][j]], W_sigma[privateLinkage[i][j]]
+//                              if (CoefWave[privateLinkage[i][j]][%Hold])
+//                                      printf " *HELD* "
+//                              endif
+//                              if ( (firstUserow != i) || (firstUseCol != j) )
+//                                      printf " ** LINKED to data set %s coefficient %d: %s", DataSets[firstUserow][0], firstUseCol-FirstCoefCol, CoefNames[privateLinkage[i][j]]
+//                              endif
+//                              print "\r"
+//                      endfor
+//              endfor
+
+        //ParseFilePath calls account for DataFolders, returning just the end (the intensity wave)
                 for (i = 0; i < numRows; i += 1)
-                        print "Data Set: ",DataSets[i][0]," vs ",DataSets[i][1],"; Function: ",FitFuncNames[privateLinkage[i][FuncPointerCol]]
+                        print "Data Set: ",ParseFilePath(0, DataSets[i][0], ":", 1, 0),  "; Function: ",FitFuncNames[privateLinkage[i][FuncPointerCol]]
                         for (j = FirstCoefCol; j < (privateLinkage[i][NumFuncCoefsCol] + FirstCoefCol); j += 1)
                                 linkIndex = privateLinkage[i][j]
                                 
                                 FirstUseOfIndexInLinkMatrix(linkIndex, privateLinkage, firstUserow, firstUsecol)
-                                printf "\t%d\t%s\t%g +- %g", j-FirstCoefCol, CoefNames[privateLinkage[i][j]], MasterCoefs[privateLinkage[i][j]], W_sigma[privateLinkage[i][j]]
+                                printf "\tCoef_%d\t%g +- %g\t", j-FirstCoefCol, MasterCoefs[privateLinkage[i][j]], W_sigma[privateLinkage[i][j]]
                                 if (CoefWave[privateLinkage[i][j]][%Hold])
-                                        printf " *HELD* "
+                                        printf "*HELD"
                                 endif
                                 if ( (firstUserow != i) || (firstUseCol != j) )
-                                        printf " ** LINKED to data set %s coefficient %d: %s", DataSets[firstUserow][0], firstUseCol-FirstCoefCol, CoefNames[privateLinkage[i][j]]
+                                        printf "*LINKED to data set %s; Coef_%d",ParseFilePath(0,  DataSets[firstUserow][0], ":", 1, 0), firstUseCol-FirstCoefCol
                                 endif
                                 print "\r"
                         endfor
                 endfor
+                String GF_resultStr=CaptureHistory(histNum, 1)
+                //eSRK, simpler reporting of results to the command window
         endif
 
@@ -1086 +1107 @@
 //                      endif
                         
+                        //SRK - generate a simple report
+                        
+                        String topGraph= WinName(0,1)
+                        Generate_GF_Report(topGraph,GF_resultStr)
+                        
+                        //eSRK
                         SetDataFolder $saveDF   
                 endfor
@@ -4701 +4728 @@
         return 0;
 end
+
+//SRK - new function to generate a report (always)
+Function Generate_GF_Report(topGraph,GF_resultStr)
+        String topGraph,GF_resultStr
+        
+        String nb = "GF_Report"
+        String str=""
+        
+        // bring report up
+        DoWindow/F GF_Report
+        if (V_flag == 0)                // Report notebook doesn't exist ?
+                NewNotebook/W=(10,45,550,620)/F=1/N=GF_Report as "Global Fit Report"
+        endif
+        // delete old stuff
+        Notebook $nb selection={startOfFile, endOfFile}, text="\r", selection={startOfFile, startOfFile}
+        
+        //setup
+        Notebook $nb defaultTab=36, statusWidth=252, pageMargins={44,44,44,44}          //44 points = 0.6" margin all around
+        Notebook $nb showRuler=1, rulerUnits=1, updating={1, 60}
+        Notebook $nb newRuler=Normal, justification=0, margins={0,0,524}, spacing={0,0,0}, tabs={}, rulerDefaults={"Geneva",10,0,(0,0,0)}
+//      
+        // insert title
+        Notebook $nb newRuler=Title, justification=1, rulerDefaults={"Times", 16, 1, (0, 0, 0)}
+        sprintf str, "Global Fit Completed %s, %s\r\r",Secs2Date(datetime, 0), time()
+        Notebook $nb ruler=Title, text=str
+        
+        //the text
+        Notebook $nb ruler=Normal
+        Notebook $nb  margins={0,0,524}, tabs={63 + 3*8192}
+        Notebook $nb text=GF_resultStr
+        
+        //the graph
+        Notebook $nb picture={$topGraph(0, 0, 400, 300), 0, 1}, text="\r"
+        
+        // show the top of the report
+        Notebook $nb  selection= {startOfFile, startOfFile},  findText={"", 1}
+        
+        //save the notebook and the graphic file
+//      if(yesSave)
+//              String nameStr=CleanupName(func,0)
+//              nameStr = nameStr[0,8]  //shorten the name
+//              nameStr += "_"+dataname
+//              //make sure the name is no more than 31 characters
+//              namestr = namestr[0,30]         //if shorter than 31, this will NOT pad to 31 characters
+//              Print "file saved as ",nameStr
+//              SaveNotebook /O/P=home/S=2 $nb as nameStr
+//              //save the graph separately as a PICT file, 2x screen
+//              pictStr += nameStr
+//              pictStr = pictStr[0,28]         //need a shorter name - why?
+////            DoWindow/F $topGraph
+//              // E=-5 is png @screen resolution
+//              // E=2 is PICT @2x screen resolution
+/////           SavePICT /E=-5/O/P=home /I/W=(0,0,3,3) as pictStr
+//              SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr
+//      Endif
+        
+        return(0)
+end
+
+
+
+

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

@@ -821 +821 @@
         Variable num=numpnts(ans),ii=0
         Notebook $nb ruler=Normal
-        Notebook Report  margins={18,18,504}, tabs={63 + 3*8192}
+        Notebook $nb  margins={18,18,504}, tabs={63 + 3*8192}
         str = "Data file: " + dataname + "\r\r"
         Notebook $nb text=str