Changeset 298

Timestamp:

Mar 6, 2008 9:23:05 AM (15 years ago)

Author:

srkline

Message:

Fixed typo in broser

Added MCR to the File Catalog.

Location:

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.10

Files:

• CatVSTable.ipf (modified) (5 diffs)
• MainPanel.ipf (modified) (1 diff)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.10/CatVSTable.ipf

@@ -54 +54 @@
         Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Temperature"
         Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:Field"
+        Make/O/D/N=0 $"root:myGlobals:CatVSHeaderInfo:MCR"              //added Mar 2008
+
 
         If(V_Flag==0)
@@ -165 +167 @@
         Wave GTemp = $"root:myGlobals:CatVSHeaderInfo:Temperature"
         Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field"
-
-        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField
+        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR"               //added Mar 2008
+
+
+        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR
         return(0)
 End
@@ -190 +194 @@
         Wave Temperature = $"root:myGlobals:CatVSHeaderInfo:Temperature"
         Wave Field= $"root:myGlobals:CatVSHeaderInfo:Field"
+        Wave MCR = $"root:myGlobals:CatVSHeaderInfo:MCR"                //added Mar 2008
+
 
 // original order, magnetic at the end
-        Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field as "Data File Catalog"
+        Edit Filenames, Labels, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens, RotAngle, Temperature, Field, MCR as "Data File Catalog"
 // alternate ordering, put the magnetic information first
 //      Edit Filenames, Labels, RotAngle, Temperature, Field, DateAndTime, SDD, Lambda, CntTime, TotCnts, CntRate, Transmission, Thickness, XCenter, YCenter, NumAttens as "Data File Catalog"
@@ -232 +238 @@
         Wave GTemp = $"root:myGlobals:CatVSHeaderInfo:Temperature"
         Wave GField = $"root:myGlobals:CatVSHeaderInfo:Field"
+        Wave GMCR = $"root:myGlobals:CatVSHeaderInfo:MCR"
         
         lastPoint = numpnts(GLambda)
@@ -315 +322 @@
         InsertPoints lastPoint,1,GIsTrans
         GIsTrans[lastPoint]  = isTransFile(fname)               //returns one if beamstop is "out"
+        
+        // Monitor Count Rate
+        InsertPoints lastPoint,1,GMCR
+        GMCR[lastPoint]  = getMonitorCount(fname)/ctime         //total monitor count / total count time
         
         return(0)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.10/MainPanel.ipf

@@ -365 +365 @@
 Function SR_OpenTracTicketPage(ctrlName)
         String ctrlName
-        DoAlert 1,"Your web broser will open to a page where you can submit your bug report or feature request. OK?"
+        DoAlert 1,"Your web browser will open to a page where you can submit your bug report or feature request. OK?"
         if(V_flag==1)
                 BrowseURL "http://danse.chem.utk.edu/trac/newticket"