Changeset 661 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf

Timestamp:

Apr 5, 2010 4:29:46 PM (12 years ago)

Author:

srkline

Message:

Added routines to enforce short enough names to keep the Igor-generated object names to less than 31 characters (once I add extensions). Changed the ExecuteProtocol? to automatically trim text from the HFIR data file names, since they are ridiculously long.

Added routines in 1D Data loader (and XML loader) to enforce 25 characters, in the case that a long file name was generated by another program.

If XML files are generated, "x" is tagged at the end of the suffix, as in ".ABSx".
Added menu items to each package menu for feedback, movies, and updates

Made sure that new table entry of SamplePosition? did not cause compile errors with other facility templates. right now, this is NCNR-specific, but easity added to other facilities if they provide the stub. then the bits of the table could be added.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf

@@ -102 +102 @@
                 ModifyTable width(:myGlobals:CatVSHeaderInfo:Field)=50
                 ModifyTable width(:myGlobals:CatVSHeaderInfo:MCR)=50
-                ModifyTable width(:myGlobals:CatVSHedaerInfo:Pos)=30
 #if (exists("ILL_D22")==6)
                 ModifyTable width(:myGlobals:CatVSHeaderInfo:Reactorpower)=50           //activate for ILL, June 2008
@@ -109 +108 @@
 #if (exists("NCNR")==6)
                 ModifyTable width(:myGlobals:CatVSHeaderInfo:nGuides)=40
+                ModifyTable width(:myGlobals:CatVSHedaerInfo:Pos)=30
 #endif
 
@@ -215 +215 @@
 #if (exists("ILL_D22")==6)
         Wave GReactPow = $"root:myGlobals:CatVSHeaderInfo:ReactorPower"         //activate for ILL June 2008 ( and the sort line too)
-        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,GReactPow
+        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GReactPow
 #endif
 
 #if (exists("NCNR")==6)
         //      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR
-        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,gNumGuides
+        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,gNumGuides
 #else
 //      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR
@@ -399 +399 @@
         GMCR[lastPoint]  = getMonitorCount(fname)/ctime         //total monitor count / total count time
 
-        //Sample Position
-        InsertPoints lastPoint,1,GPos
-        GPos[lastPoint] = getSamplePosition(fname)
+
 
 #if (exists("ILL_D22")==6)
@@ -413 +411 @@
         InsertPoints lastPoint,1,GNumGuides
         GNumGuides[lastPoint]  = numGuides(getSourceToSampleDist(fname))
+        
+        //Sample Position
+        InsertPoints lastPoint,1,GPos
+        GPos[lastPoint] = getSamplePosition(fname)
 #endif