From: <ro...@us...> - 2012-06-08 13:26:07
|
Revision: 2015 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=2015&view=rev Author: ron-fox Date: 2012-06-08 13:25:55 +0000 (Fri, 08 Jun 2012) Log Message: ----------- Merge 3.3-009 development Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Makefile.am trunk/SpecTcl/configure.ac trunk/SpecTcl/doc/Commands/treeparameter.htm trunk/SpecTcl/gri-2.12.20/doc/index.html Added Paths: ----------- trunk/SpecTcl/ccusb/ trunk/SpecTcl/ccusb/CC1205Unpacker.cpp trunk/SpecTcl/ccusb/CC1205Unpacker.h trunk/SpecTcl/ccusb/CCCUSBPacket.cpp trunk/SpecTcl/ccusb/CCCUSBPacket.h trunk/SpecTcl/ccusb/CCUSBUnpacker.cpp trunk/SpecTcl/ccusb/CCUSBUnpacker.h trunk/SpecTcl/ccusb/CFixedSizedUnpacker.cpp trunk/SpecTcl/ccusb/CFixedSizedUnpacker.h trunk/SpecTcl/ccusb/CPh7xxUnpacker.cpp trunk/SpecTcl/ccusb/CPh7xxUnpacker.h trunk/SpecTcl/ccusb/Makefile.am trunk/SpecTcl/ccusb/MakefileSkel.in trunk/SpecTcl/ccusb/MySpecTclApp.cpp trunk/SpecTcl/ccusb/MySpecTclApp.h trunk/SpecTcl/ccusb/ParamMapCommand.cpp trunk/SpecTcl/ccusb/ParamMapCommand.h trunk/SpecTcl/ccusb/SpecTclRC.tcl trunk/SpecTcl/ccusb/ccusbSpecTcl.xml trunk/SpecTcl/ccusb/failsafe.tcl trunk/SpecTcl/ccusb/spectclconfig.tcl trunk/SpecTcl/treegui/gateCreateTest.tcl trunk/SpecTcl/treegui/gateSelTest.tcl trunk/SpecTcl/treegui/gateTableTest.tcl trunk/SpecTcl/vmusb/ trunk/SpecTcl/vmusb/C785Unpacker.cpp trunk/SpecTcl/vmusb/C785Unpacker.h trunk/SpecTcl/vmusb/CFitButton.cpp trunk/SpecTcl/vmusb/CFitButton.h trunk/SpecTcl/vmusb/CHINP.cpp trunk/SpecTcl/vmusb/CHINP.h trunk/SpecTcl/vmusb/CLLNLUnpacker.cpp trunk/SpecTcl/vmusb/CLLNLUnpacker.h trunk/SpecTcl/vmusb/CMADC32Unpacker.cpp trunk/SpecTcl/vmusb/CMADC32Unpacker.h trunk/SpecTcl/vmusb/CMASE.cpp trunk/SpecTcl/vmusb/CMASE.h trunk/SpecTcl/vmusb/CModuleUnpacker.cpp trunk/SpecTcl/vmusb/CModuleUnpacker.h trunk/SpecTcl/vmusb/CNADC2530Unpacker.cpp trunk/SpecTcl/vmusb/CNADC2530Unpacker.h trunk/SpecTcl/vmusb/CPSD.cpp trunk/SpecTcl/vmusb/CPSD.h trunk/SpecTcl/vmusb/CParamMapCommand.cpp trunk/SpecTcl/vmusb/CParamMapCommand.h trunk/SpecTcl/vmusb/CRateCommand.cpp trunk/SpecTcl/vmusb/CRateCommand.h trunk/SpecTcl/vmusb/CRateEventProcessor.cpp trunk/SpecTcl/vmusb/CRateEventProcessor.h trunk/SpecTcl/vmusb/CRateEventProcssor.cpp trunk/SpecTcl/vmusb/CRateEventProcssor.h trunk/SpecTcl/vmusb/CRateList.cpp trunk/SpecTcl/vmusb/CRateList.h trunk/SpecTcl/vmusb/CRateProcessor.cpp trunk/SpecTcl/vmusb/CRateProcessor.h trunk/SpecTcl/vmusb/CStackMapCommand.cpp trunk/SpecTcl/vmusb/CStackMapCommand.h trunk/SpecTcl/vmusb/CStackUnpacker.cpp trunk/SpecTcl/vmusb/CStackUnpacker.h trunk/SpecTcl/vmusb/CV1729Unpacker.cpp trunk/SpecTcl/vmusb/CV1729Unpacker.h trunk/SpecTcl/vmusb/CV1x90Unpacker.cpp trunk/SpecTcl/vmusb/CV1x90Unpacker.h trunk/SpecTcl/vmusb/CV977Unpacker.cpp trunk/SpecTcl/vmusb/CV977Unpacker.h trunk/SpecTcl/vmusb/LICENCE.cpp trunk/SpecTcl/vmusb/LICENCE.tcl trunk/SpecTcl/vmusb/Makefile.am trunk/SpecTcl/vmusb/MakefileSkel.in trunk/SpecTcl/vmusb/MySpecTclApp.cpp trunk/SpecTcl/vmusb/MySpecTclApp.h trunk/SpecTcl/vmusb/SpecTclInit.tcl trunk/SpecTcl/vmusb/SpecTclRC.tcl trunk/SpecTcl/vmusb/configFile.tcl trunk/SpecTcl/vmusb/constants.tcl trunk/SpecTcl/vmusb/failsafe.tcl trunk/SpecTcl/vmusb/fom.tcl trunk/SpecTcl/vmusb/project.tcl trunk/SpecTcl/vmusb/rates.tcl trunk/SpecTcl/vmusb/ratesGui.tcl trunk/SpecTcl/vmusb/setup.tcl trunk/SpecTcl/vmusb/spectclSetup.tcl trunk/SpecTcl/vmusb/testing.tcl trunk/SpecTcl/vmusb/vmusb.xml Removed Paths: ------------- trunk/SpecTcl/ccusb/CC1205Unpacker.cpp trunk/SpecTcl/ccusb/CC1205Unpacker.h trunk/SpecTcl/ccusb/CCCUSBPacket.cpp trunk/SpecTcl/ccusb/CCCUSBPacket.h trunk/SpecTcl/ccusb/CCUSBUnpacker.cpp trunk/SpecTcl/ccusb/CCUSBUnpacker.h trunk/SpecTcl/ccusb/CFixedSizedUnpacker.cpp trunk/SpecTcl/ccusb/CFixedSizedUnpacker.h trunk/SpecTcl/ccusb/CPh7xxUnpacker.cpp trunk/SpecTcl/ccusb/CPh7xxUnpacker.h trunk/SpecTcl/ccusb/Makefile.am trunk/SpecTcl/ccusb/MakefileSkel.in trunk/SpecTcl/ccusb/MySpecTclApp.cpp trunk/SpecTcl/ccusb/MySpecTclApp.h trunk/SpecTcl/ccusb/ParamMapCommand.cpp trunk/SpecTcl/ccusb/ParamMapCommand.h trunk/SpecTcl/ccusb/SpecTclRC.tcl trunk/SpecTcl/ccusb/ccusbSpecTcl.xml trunk/SpecTcl/ccusb/failsafe.tcl trunk/SpecTcl/ccusb/spectclconfig.tcl trunk/SpecTcl/vmusb/C785Unpacker.cpp trunk/SpecTcl/vmusb/C785Unpacker.h trunk/SpecTcl/vmusb/CFitButton.cpp trunk/SpecTcl/vmusb/CFitButton.h trunk/SpecTcl/vmusb/CHINP.cpp trunk/SpecTcl/vmusb/CHINP.h trunk/SpecTcl/vmusb/CLLNLUnpacker.cpp trunk/SpecTcl/vmusb/CLLNLUnpacker.h trunk/SpecTcl/vmusb/CMADC32Unpacker.cpp trunk/SpecTcl/vmusb/CMADC32Unpacker.h trunk/SpecTcl/vmusb/CMASE.cpp trunk/SpecTcl/vmusb/CMASE.h trunk/SpecTcl/vmusb/CModuleUnpacker.cpp trunk/SpecTcl/vmusb/CModuleUnpacker.h trunk/SpecTcl/vmusb/CNADC2530Unpacker.cpp trunk/SpecTcl/vmusb/CNADC2530Unpacker.h trunk/SpecTcl/vmusb/CPSD.cpp trunk/SpecTcl/vmusb/CPSD.h trunk/SpecTcl/vmusb/CParamMapCommand.cpp trunk/SpecTcl/vmusb/CParamMapCommand.h trunk/SpecTcl/vmusb/CRateCommand.cpp trunk/SpecTcl/vmusb/CRateCommand.h trunk/SpecTcl/vmusb/CRateEventProcessor.cpp trunk/SpecTcl/vmusb/CRateEventProcessor.h trunk/SpecTcl/vmusb/CRateEventProcssor.cpp trunk/SpecTcl/vmusb/CRateEventProcssor.h trunk/SpecTcl/vmusb/CRateList.cpp trunk/SpecTcl/vmusb/CRateList.h trunk/SpecTcl/vmusb/CRateProcessor.cpp trunk/SpecTcl/vmusb/CRateProcessor.h trunk/SpecTcl/vmusb/CStackMapCommand.cpp trunk/SpecTcl/vmusb/CStackMapCommand.h trunk/SpecTcl/vmusb/CStackUnpacker.cpp trunk/SpecTcl/vmusb/CStackUnpacker.h trunk/SpecTcl/vmusb/CV1729Unpacker.cpp trunk/SpecTcl/vmusb/CV1729Unpacker.h trunk/SpecTcl/vmusb/CV1x90Unpacker.cpp trunk/SpecTcl/vmusb/CV1x90Unpacker.h trunk/SpecTcl/vmusb/CV977Unpacker.cpp trunk/SpecTcl/vmusb/CV977Unpacker.h trunk/SpecTcl/vmusb/LICENCE.cpp trunk/SpecTcl/vmusb/LICENCE.tcl trunk/SpecTcl/vmusb/Makefile.am trunk/SpecTcl/vmusb/MakefileSkel.in trunk/SpecTcl/vmusb/MySpecTclApp.cpp trunk/SpecTcl/vmusb/MySpecTclApp.h trunk/SpecTcl/vmusb/SpecTclInit.tcl trunk/SpecTcl/vmusb/SpecTclRC.tcl trunk/SpecTcl/vmusb/configFile.tcl trunk/SpecTcl/vmusb/constants.tcl trunk/SpecTcl/vmusb/failsafe.tcl trunk/SpecTcl/vmusb/fom.tcl trunk/SpecTcl/vmusb/project.tcl trunk/SpecTcl/vmusb/rates.tcl trunk/SpecTcl/vmusb/ratesGui.tcl trunk/SpecTcl/vmusb/setup.tcl trunk/SpecTcl/vmusb/spectclSetup.tcl trunk/SpecTcl/vmusb/testing.tcl trunk/SpecTcl/vmusb/vmusb.xml Property Changed: ---------------- trunk/SpecTcl/ Property changes on: trunk/SpecTcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.3-007-dev:1983-1986 /branches/3.3-008-dev:1987-1996 + /branches/3.3-007-dev:1983-1986 /branches/3.3-008-dev:1987-1996 /branches/3.3-009-development:2000-2014 Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/CHANGELOG 2012-06-08 13:25:55 UTC (rev 2015) @@ -959,4 +959,10 @@ - issue 105 In folder gui make spectrum save a 2-step wizard so that it fits on small screens better. - issue 973 Do a smart search for the ring buffer clients in data source tcl. - - issue 866 Protect GUIs (folder standalone and tree) from multiple startups. \ No newline at end of file + - issue 866 Protect GUIs (folder standalone and tree) from multiple startups. + +3.3-009 + - May 4, 2012 - Added cusbSpecTcl to the build. + - June 6, 2012 - Added vmusbSpecTcl to the build. + - June 6, 2012 Tell user about missing parameters array elements. + - June 6, 2012 VMUSBSpecTcl - process madc -resolution config option. Modified: trunk/SpecTcl/Makefile.am =================================================================== --- trunk/SpecTcl/Makefile.am 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/Makefile.am 2012-06-08 13:25:55 UTC (rev 2015) @@ -3,8 +3,10 @@ TCL Events Gates Sorter SpectrumIO Filter Analysis\ DecoderRing TreeParam \ Fits SpecTcl \ - contrib TestFiles Gui splash filtsplit calibratedparams treegui + contrib TestFiles Gui splash filtsplit calibratedparams treegui ccusb vmusb +ACLOCAL_AMFLAGS=-I m4 + # Gri TestFiles need to be figured out still.. AUX_DIST = $(ac_aux_dir)/config.guess \ Deleted: trunk/SpecTcl/ccusb/CC1205Unpacker.cpp =================================================================== --- branches/3.3-009-development/ccusb/CC1205Unpacker.cpp 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CC1205Unpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,141 +0,0 @@ -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ -#include <config.h> -#include "CC1205Unpacker.h" -#include <Event.h> -#include <vector> -#include <stdint.h> -using namespace std; - -/* - * Constants that define the bits in each type of word that can apear - * in the data: - */ - -static const uint32_t dataMask(0xffffff); // 24 bit mask. - -static const uint32_t typeMask (0xc00000); // Type of datum is here. -static const uint32_t typeHeader (0x800000); // Word is header. -static const uint32_t typeData (0x000000); // Word is parameter data. -static const uint32_t typeOverflow(0xc00000); // Word has overflow mask. -static const uint32_t typeTrailer (0x400000); // Word is a trailer. - -// Header fields/values: - -static const uint32_t headerCSRMask (0x007fff); -static const uint32_t headerEvNumMask(0x0f0000); - -// Data word format: - -static const uint32_t dataValueMask(0x003fff); // Data value mask -static const int32_t dataSignBit (0x002000); // If set conversion negative. -static const int32_t dataSignExtend(0xffffc000); -static const uint32_t rangeMask (0x00c000); -static const uint32_t rangeLow (0x000000); -static const uint32_t rangeMid (0x004000); -static const uint32_t rangeHigh (0x008000); -static const uint32_t rangeOverflow(0x00c000); -static const uint32_t rangeShift (14); -static const uint32_t channelMask (0x0f0000); -static const uint32_t channelShift (16); - -// Overflow word: - -static const uint32_t overflowFlags(0x00ffff); - - -// trailer: - -static const uint32_t trailerOnes(0x0000ff); - - - -/*! - Unpack a block of data that looks like: -\verbatim - +------------------------------------------+ - | id | - +------------------------------------------+ - | Header | - +------------------------------------------+ - | data words.... | - - +------------------------------------------+ - | Optional overflow word | - +------------------------------------------+ - | Separator word | - +------------------------------------------+ - -\endverbatim - - @param p - Translator pointer that gets us at the data - (the id is presumed to have been previously validated). - @param pModuleInfo - Pointer to the module info (which includes the - channel-> parameter map. - @param rEvent - Reference to the channel -> parametr map. - @return int - @retval Number of words actually consumed (1 + m_numWords) - -*/ -int -CC1205Unpacker::unpack(TranslatorPointer<UShort_t> p, - const CParamMapCommand::ParameterMap* pModuleInfo, - CEvent& rEvent) -{ - ++p; // Caller has already checked the marker word. - const vector<int>& parameterMap = pModuleInfo->s_parameterIds; - int numWords = 1; // Number of words in packet. - TranslatorPointer<uint32_t> pEvent(p); // All the words I care about are 32 bit - - uint32_t datum; - do { - datum = *pEvent; ++pEvent; - - // We're only going to pay attention to the data words for now: - - uint32_t type = datum & typeMask; - if (type == typeData) { - // Extract the channel number and the range. - // 4 (overflow) is ignored. - // channel *3 is the starting point in the channel array - // add the range to that to get the actual parameter: - - uint32_t channel = (datum & channelMask) >> channelShift; - uint32_t range = (datum & rangeMask); - if (range != rangeOverflow) { - int paramIndex = channel * 3; - paramIndex += (range >> rangeShift); // Parameter index. - if (paramIndex < parameterMap.size()) { - int parno = parameterMap[paramIndex]; - if (parno >= 0) { - int32_t conversion = datum & dataValueMask; - // If the conversion is negative sign extend it: - if (conversion & dataSignExtend) { - conversion |= dataSignExtend; - } - - rEvent[parno] = conversion; - } - } - } - } - numWords+= 2; // Processed a longword. - } while ((datum & typeMask) != typeTrailer); - - return numWords; - -} - Copied: trunk/SpecTcl/ccusb/CC1205Unpacker.cpp (from rev 2014, branches/3.3-009-development/ccusb/CC1205Unpacker.cpp) =================================================================== --- trunk/SpecTcl/ccusb/CC1205Unpacker.cpp (rev 0) +++ trunk/SpecTcl/ccusb/CC1205Unpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,141 @@ +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ +#include <config.h> +#include "CC1205Unpacker.h" +#include <Event.h> +#include <vector> +#include <stdint.h> +using namespace std; + +/* + * Constants that define the bits in each type of word that can apear + * in the data: + */ + +static const uint32_t dataMask(0xffffff); // 24 bit mask. + +static const uint32_t typeMask (0xc00000); // Type of datum is here. +static const uint32_t typeHeader (0x800000); // Word is header. +static const uint32_t typeData (0x000000); // Word is parameter data. +static const uint32_t typeOverflow(0xc00000); // Word has overflow mask. +static const uint32_t typeTrailer (0x400000); // Word is a trailer. + +// Header fields/values: + +static const uint32_t headerCSRMask (0x007fff); +static const uint32_t headerEvNumMask(0x0f0000); + +// Data word format: + +static const uint32_t dataValueMask(0x003fff); // Data value mask +static const int32_t dataSignBit (0x002000); // If set conversion negative. +static const int32_t dataSignExtend(0xffffc000); +static const uint32_t rangeMask (0x00c000); +static const uint32_t rangeLow (0x000000); +static const uint32_t rangeMid (0x004000); +static const uint32_t rangeHigh (0x008000); +static const uint32_t rangeOverflow(0x00c000); +static const uint32_t rangeShift (14); +static const uint32_t channelMask (0x0f0000); +static const uint32_t channelShift (16); + +// Overflow word: + +static const uint32_t overflowFlags(0x00ffff); + + +// trailer: + +static const uint32_t trailerOnes(0x0000ff); + + + +/*! + Unpack a block of data that looks like: +\verbatim + +------------------------------------------+ + | id | + +------------------------------------------+ + | Header | + +------------------------------------------+ + | data words.... | + + +------------------------------------------+ + | Optional overflow word | + +------------------------------------------+ + | Separator word | + +------------------------------------------+ + +\endverbatim + + @param p - Translator pointer that gets us at the data + (the id is presumed to have been previously validated). + @param pModuleInfo - Pointer to the module info (which includes the + channel-> parameter map. + @param rEvent - Reference to the channel -> parametr map. + @return int + @retval Number of words actually consumed (1 + m_numWords) + +*/ +int +CC1205Unpacker::unpack(TranslatorPointer<UShort_t> p, + const CParamMapCommand::ParameterMap* pModuleInfo, + CEvent& rEvent) +{ + ++p; // Caller has already checked the marker word. + const vector<int>& parameterMap = pModuleInfo->s_parameterIds; + int numWords = 1; // Number of words in packet. + TranslatorPointer<uint32_t> pEvent(p); // All the words I care about are 32 bit + + uint32_t datum; + do { + datum = *pEvent; ++pEvent; + + // We're only going to pay attention to the data words for now: + + uint32_t type = datum & typeMask; + if (type == typeData) { + // Extract the channel number and the range. + // 4 (overflow) is ignored. + // channel *3 is the starting point in the channel array + // add the range to that to get the actual parameter: + + uint32_t channel = (datum & channelMask) >> channelShift; + uint32_t range = (datum & rangeMask); + if (range != rangeOverflow) { + int paramIndex = channel * 3; + paramIndex += (range >> rangeShift); // Parameter index. + if (paramIndex < parameterMap.size()) { + int parno = parameterMap[paramIndex]; + if (parno >= 0) { + int32_t conversion = datum & dataValueMask; + // If the conversion is negative sign extend it: + if (conversion & dataSignExtend) { + conversion |= dataSignExtend; + } + + rEvent[parno] = conversion; + } + } + } + } + numWords+= 2; // Processed a longword. + } while ((datum & typeMask) != typeTrailer); + + return numWords; + +} + Deleted: trunk/SpecTcl/ccusb/CC1205Unpacker.h =================================================================== --- branches/3.3-009-development/ccusb/CC1205Unpacker.h 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CC1205Unpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,42 +0,0 @@ -#ifndef __CC1205UNPACKER_H -#define __CC1205UNPACKER_H - - -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ -#ifndef __CCCUSBPACKET_H -#include "CCCUSBPacket.h" -#endif - -class CEvent; - -/*! - This class unpacks data from a CAEN C1205 QDC. Data from this module - consists of a header, followed by a series of data words, followed by - an optional overflow word. completed by a separator word. The format - of each of these is documented in sections 3.2.7-3.2.10 of the - CAEN 1205 module. (REV5 puts this at page 11). - -*/ -class CC1205Unpacker :public CCCUSBPacket -{ -public: - int unpack(TranslatorPointer<UShort_t> p, - const CParamMapCommand::ParameterMap* pModuleInfo, - CEvent& rEvent); -}; - -#endif Copied: trunk/SpecTcl/ccusb/CC1205Unpacker.h (from rev 2014, branches/3.3-009-development/ccusb/CC1205Unpacker.h) =================================================================== --- trunk/SpecTcl/ccusb/CC1205Unpacker.h (rev 0) +++ trunk/SpecTcl/ccusb/CC1205Unpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,42 @@ +#ifndef __CC1205UNPACKER_H +#define __CC1205UNPACKER_H + + +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ +#ifndef __CCCUSBPACKET_H +#include "CCCUSBPacket.h" +#endif + +class CEvent; + +/*! + This class unpacks data from a CAEN C1205 QDC. Data from this module + consists of a header, followed by a series of data words, followed by + an optional overflow word. completed by a separator word. The format + of each of these is documented in sections 3.2.7-3.2.10 of the + CAEN 1205 module. (REV5 puts this at page 11). + +*/ +class CC1205Unpacker :public CCCUSBPacket +{ +public: + int unpack(TranslatorPointer<UShort_t> p, + const CParamMapCommand::ParameterMap* pModuleInfo, + CEvent& rEvent); +}; + +#endif Deleted: trunk/SpecTcl/ccusb/CCCUSBPacket.cpp =================================================================== --- branches/3.3-009-development/ccusb/CCCUSBPacket.cpp 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CCCUSBPacket.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,72 +0,0 @@ -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ - - -#include <config.h> -#include "CCCUSBPacket.h" - - -/* - The table below is the number of bits set in a 4 bit mask. - e.g. bitCount[5] = 2 because 5 = 101b. - - this is used to speed up the couting of bits in a 16 bit mask by - turning it in to 4 table lookups rather than 16 bit checks. - -*/ - -static int bitCount[16] = { - 0, // 0000 - 1, // 0001 - 1, // 0010 - 2, // 0011 - 1, // 0100 - 2, // 0101 - 2, // 0110 - 3, // 0111 - 1, // 1000 - 2, // 1001 - 2, // 1010 - 3, // 1011 - 2, // 1100 - 3, // 1101 - 3, // 1110 - 4 }; // 1111 - -//////////////////////////////////////////////////////////////////////////////////// -/* - Returns the number of bits in 16 bit mask that is passed into us. - We use the bitCount array to speed this up to 4 table lookups from - 16 bit tests. - Parameters: - mask - The mask in which to count bits. -*/ -int -CCCUSBPacket::bitsInMask(UShort_t mask) -{ - int count = 0; - - // The loop below is faster than a counted loop because - // - there's no increment, and we have to shift the mask anyway. - // - We'll short cut out of the loop in there are upper nybbles that don't - // have bits set. - // - while(mask) { - count += bitCount[mask & 0xf]; // Count lowest 4 bits. - mask = mask >> 4; // Next 4 bits. - } - return count; -} Copied: trunk/SpecTcl/ccusb/CCCUSBPacket.cpp (from rev 2014, branches/3.3-009-development/ccusb/CCCUSBPacket.cpp) =================================================================== --- trunk/SpecTcl/ccusb/CCCUSBPacket.cpp (rev 0) +++ trunk/SpecTcl/ccusb/CCCUSBPacket.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,72 @@ +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ + + +#include <config.h> +#include "CCCUSBPacket.h" + + +/* + The table below is the number of bits set in a 4 bit mask. + e.g. bitCount[5] = 2 because 5 = 101b. + + this is used to speed up the couting of bits in a 16 bit mask by + turning it in to 4 table lookups rather than 16 bit checks. + +*/ + +static int bitCount[16] = { + 0, // 0000 + 1, // 0001 + 1, // 0010 + 2, // 0011 + 1, // 0100 + 2, // 0101 + 2, // 0110 + 3, // 0111 + 1, // 1000 + 2, // 1001 + 2, // 1010 + 3, // 1011 + 2, // 1100 + 3, // 1101 + 3, // 1110 + 4 }; // 1111 + +//////////////////////////////////////////////////////////////////////////////////// +/* + Returns the number of bits in 16 bit mask that is passed into us. + We use the bitCount array to speed this up to 4 table lookups from + 16 bit tests. + Parameters: + mask - The mask in which to count bits. +*/ +int +CCCUSBPacket::bitsInMask(UShort_t mask) +{ + int count = 0; + + // The loop below is faster than a counted loop because + // - there's no increment, and we have to shift the mask anyway. + // - We'll short cut out of the loop in there are upper nybbles that don't + // have bits set. + // + while(mask) { + count += bitCount[mask & 0xf]; // Count lowest 4 bits. + mask = mask >> 4; // Next 4 bits. + } + return count; +} Deleted: trunk/SpecTcl/ccusb/CCCUSBPacket.h =================================================================== --- branches/3.3-009-development/ccusb/CCCUSBPacket.h 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CCCUSBPacket.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,45 +0,0 @@ -#ifndef __CCCUSBPACKET_H -#define __CCCUSBPACKET_H - -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ - -#ifndef __TRANSLATORPOINTER_H -#include <TranslatorPointer.h> -#endif - -#ifndef __PARAMMAPCOMMAND_H -#include "ParamMapCommand.h" -#endif - -class CEvent; - -/*! - Defines an interface for unpackers of a specific module unpacker. -*/ -class CCCUSBPacket -{ -public: - virtual int unpack(TranslatorPointer<UShort_t> p, - const CParamMapCommand::ParameterMap* pModuleInfo, - CEvent& rEvent) = 0; - -protected: - static int bitsInMask(UShort_t mask); -}; - - -#endif Copied: trunk/SpecTcl/ccusb/CCCUSBPacket.h (from rev 2014, branches/3.3-009-development/ccusb/CCCUSBPacket.h) =================================================================== --- trunk/SpecTcl/ccusb/CCCUSBPacket.h (rev 0) +++ trunk/SpecTcl/ccusb/CCCUSBPacket.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,45 @@ +#ifndef __CCCUSBPACKET_H +#define __CCCUSBPACKET_H + +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ + +#ifndef __TRANSLATORPOINTER_H +#include <TranslatorPointer.h> +#endif + +#ifndef __PARAMMAPCOMMAND_H +#include "ParamMapCommand.h" +#endif + +class CEvent; + +/*! + Defines an interface for unpackers of a specific module unpacker. +*/ +class CCCUSBPacket +{ +public: + virtual int unpack(TranslatorPointer<UShort_t> p, + const CParamMapCommand::ParameterMap* pModuleInfo, + CEvent& rEvent) = 0; + +protected: + static int bitsInMask(UShort_t mask); +}; + + +#endif Deleted: trunk/SpecTcl/ccusb/CCUSBUnpacker.cpp =================================================================== --- branches/3.3-009-development/ccusb/CCUSBUnpacker.cpp 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CCUSBUnpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,151 +0,0 @@ -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ -#include <config.h> -#include "CCUSBUnpacker.h" -#include <Event.h> -#include <Analyzer.h> -#include <BufferDecoder.h> -#include <TCLAnalyzer.h> -#include "ParamMapCommand.h" -#include "CCCUSBPacket.h" -#include "CPh7xxUnpacker.h" -#include "CFixedSizedUnpacker.h" -#include "CC1205Unpacker.h" - - -#include <string> -#include <iostream> -#include <stdio.h> - -using namespace std; - - - - -static CPh7xxxUnpacker ph7xxx; -static CFixedSizedUnpacker ad811(8); -static CFixedSizedUnpacker lrs2249w(12); -static CFixedSizedUnpacker lrs2228(8); -static CC1205Unpacker c1205; - -static CCCUSBPacket* unpackers[] = { - &ph7xxx, // Type 0 => phillips 7xxx - &ad811, // Type 1 => Ortec AD811 - &lrs2249w, // Type 2 => LRS 2249 QDC - &lrs2228, // Type 3 => LRS 2228 TDC. - &c1205 // Type 4 => CAEN C1205 QDC. -}; // Indices must match types in spectclsetup.tcl - -/////////////////////////////////////////////////////////////////////////////////// -/*! - Analyze an event. - \param pEvent - Pointer to the raw event. We assume that buffer byte order - signatures are present that will allow us to determine the - byte ordering. - \param rEvent - The parameter 'array' into which this data will be unpacked. - \param rAnalyzer - The analyzer that's in charge of this buffer. This is - a CTCLAnalyzer to which we need to give the size of the event - \param rDecoder - The buffer decoder that understands the outer structure of the - event buffer. We're going to use it to get byte ordering to - construct a translating pointer so we can reference the - data correctly even if there is a byte ordering mis-match - between this system and the one that created the data. -*/ -Bool_t -CCUSBUnpacker::operator()(const Address_t pEvent, - CEvent& rEvent, - CAnalyzer& rAnalyzer, - CBufferDecoder& rDecoder) -{ - - // Get all the book-keeping out of the way and create a pointer - // p that points to the event body, and nWords, a remaining word count. - // - - TranslatorPointer<UShort_t> p(*(rDecoder.getBufferTranslator()), pEvent); - CTclAnalyzer& rAna((CTclAnalyzer&)rAnalyzer); - UShort_t nWords = *p++; // Word count and pointer to body. - rAna.SetEventSize((nWords+1)*sizeof(UShort_t)); - - - // Note in the CCUSB the word count is not self inclusive! - - - CParamMapCommand* pMap = CParamMapCommand::getInstance(); - int module = 0; - - - // Get the data - // The CCUSB puts in an extra word after the end of a QStop transfer. - // (the data when Q was not set). I've arranged that the - // max transfer count be 17 not 16 so that there's always - // that extra word, and therefore we know to unconditionally - // skip it. - - while (nWords > 0) { - - const CParamMapCommand::ParameterMap* moduleInfo= pMap->getModuleMap(module); - int type = moduleInfo->s_moduleType; - int id = moduleInfo->s_id; - - try { - - // Do some sanity checking here specifically: - // - The type must be valid. - // - The id must match the id of the next unpacker because - // all readers must at least put their id in the buffer. - // - if ((type < 0) || (type >= sizeof(unpackers)/sizeof(CCCUSBPacket*))) { - char message[100]; - sprintf(message, "Module type %d is out of range", type); - throw string(message); - } - CCCUSBPacket* pUnpacker = unpackers[type]; - if (id != *p) { - char message[100]; - sprintf(message, "ID in buffer: %d does not match that of expected unpacker (%d)", - id, *p); - throw message; - } - - int wordsConsumed = pUnpacker->unpack(p, moduleInfo, rEvent); - - p += wordsConsumed; - nWords -= wordsConsumed; - module++; - - } - catch (string msg) { - cerr << "Error unpacking data: " << msg << " Event will be ignored " << endl; - return kfFALSE; - } - catch (const char* msg) { - cerr << "Error unpacking data: " << msg << " event will be ignored " << endl; - return kfFALSE; - } - catch (...) { - cerr << "Error unpacking data .. unable to determine cause event will be ignored\n"; - return kfFALSE; - } - - } - - // Must return true to histogram. - - return kfTRUE; -} - - Copied: trunk/SpecTcl/ccusb/CCUSBUnpacker.cpp (from rev 2014, branches/3.3-009-development/ccusb/CCUSBUnpacker.cpp) =================================================================== --- trunk/SpecTcl/ccusb/CCUSBUnpacker.cpp (rev 0) +++ trunk/SpecTcl/ccusb/CCUSBUnpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,151 @@ +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ +#include <config.h> +#include "CCUSBUnpacker.h" +#include <Event.h> +#include <Analyzer.h> +#include <BufferDecoder.h> +#include <TCLAnalyzer.h> +#include "ParamMapCommand.h" +#include "CCCUSBPacket.h" +#include "CPh7xxUnpacker.h" +#include "CFixedSizedUnpacker.h" +#include "CC1205Unpacker.h" + + +#include <string> +#include <iostream> +#include <stdio.h> + +using namespace std; + + + + +static CPh7xxxUnpacker ph7xxx; +static CFixedSizedUnpacker ad811(8); +static CFixedSizedUnpacker lrs2249w(12); +static CFixedSizedUnpacker lrs2228(8); +static CC1205Unpacker c1205; + +static CCCUSBPacket* unpackers[] = { + &ph7xxx, // Type 0 => phillips 7xxx + &ad811, // Type 1 => Ortec AD811 + &lrs2249w, // Type 2 => LRS 2249 QDC + &lrs2228, // Type 3 => LRS 2228 TDC. + &c1205 // Type 4 => CAEN C1205 QDC. +}; // Indices must match types in spectclsetup.tcl + +/////////////////////////////////////////////////////////////////////////////////// +/*! + Analyze an event. + \param pEvent - Pointer to the raw event. We assume that buffer byte order + signatures are present that will allow us to determine the + byte ordering. + \param rEvent - The parameter 'array' into which this data will be unpacked. + \param rAnalyzer - The analyzer that's in charge of this buffer. This is + a CTCLAnalyzer to which we need to give the size of the event + \param rDecoder - The buffer decoder that understands the outer structure of the + event buffer. We're going to use it to get byte ordering to + construct a translating pointer so we can reference the + data correctly even if there is a byte ordering mis-match + between this system and the one that created the data. +*/ +Bool_t +CCUSBUnpacker::operator()(const Address_t pEvent, + CEvent& rEvent, + CAnalyzer& rAnalyzer, + CBufferDecoder& rDecoder) +{ + + // Get all the book-keeping out of the way and create a pointer + // p that points to the event body, and nWords, a remaining word count. + // + + TranslatorPointer<UShort_t> p(*(rDecoder.getBufferTranslator()), pEvent); + CTclAnalyzer& rAna((CTclAnalyzer&)rAnalyzer); + UShort_t nWords = *p++; // Word count and pointer to body. + rAna.SetEventSize((nWords+1)*sizeof(UShort_t)); + + + // Note in the CCUSB the word count is not self inclusive! + + + CParamMapCommand* pMap = CParamMapCommand::getInstance(); + int module = 0; + + + // Get the data + // The CCUSB puts in an extra word after the end of a QStop transfer. + // (the data when Q was not set). I've arranged that the + // max transfer count be 17 not 16 so that there's always + // that extra word, and therefore we know to unconditionally + // skip it. + + while (nWords > 0) { + + const CParamMapCommand::ParameterMap* moduleInfo= pMap->getModuleMap(module); + int type = moduleInfo->s_moduleType; + int id = moduleInfo->s_id; + + try { + + // Do some sanity checking here specifically: + // - The type must be valid. + // - The id must match the id of the next unpacker because + // all readers must at least put their id in the buffer. + // + if ((type < 0) || (type >= sizeof(unpackers)/sizeof(CCCUSBPacket*))) { + char message[100]; + sprintf(message, "Module type %d is out of range", type); + throw string(message); + } + CCCUSBPacket* pUnpacker = unpackers[type]; + if (id != *p) { + char message[100]; + sprintf(message, "ID in buffer: %d does not match that of expected unpacker (%d)", + id, *p); + throw message; + } + + int wordsConsumed = pUnpacker->unpack(p, moduleInfo, rEvent); + + p += wordsConsumed; + nWords -= wordsConsumed; + module++; + + } + catch (string msg) { + cerr << "Error unpacking data: " << msg << " Event will be ignored " << endl; + return kfFALSE; + } + catch (const char* msg) { + cerr << "Error unpacking data: " << msg << " event will be ignored " << endl; + return kfFALSE; + } + catch (...) { + cerr << "Error unpacking data .. unable to determine cause event will be ignored\n"; + return kfFALSE; + } + + } + + // Must return true to histogram. + + return kfTRUE; +} + + Deleted: trunk/SpecTcl/ccusb/CCUSBUnpacker.h =================================================================== --- branches/3.3-009-development/ccusb/CCUSBUnpacker.h 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CCUSBUnpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,73 +0,0 @@ -#ifndef __CCUSBUNPACKER_H -#define __CCUSBUNPACKER_H -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ - - -#ifndef __EVENTPROCESSOR_H -#include <EventProcessor.h> -#endif - - -/*! - Unpack data from the CCUSB when it contains a bunch of - data from Phillips modules. All phillips modules are assumed - to be configured to at least insert a channel hit pattern and are - in zero suppressed mode. This implies that the hit pattern tells us how - many channels are present in the data. Each channel includes a channel number tag - in the top 4 bits that, along with the position of the module in the data stream - unambiguously determines the channel. - - The parammap command is used to describe the correspondence between - module/channel and SpecTcl parameters. We can fetch from this map from the - parammap command singleton in terms of parameter ids which makes the unpacking - of a module relatively trivial. - - The format of a single event is: -\verbatim - - +-------------------+ - | event word count | - +-------------------+ - | id for first mod | - +-------------------+ - | Data from first | - | module | - | /\/\/\/\/\ - +-------------------+ - | id for second mod | - etc. - -\endverbatim - -\note the event word count is not self inclusive - -*/ - -class CCUSBUnpacker : public CEventProcessor -{ -public: - virtual Bool_t operator()(const Address_t pEvent, - CEvent& rEvent, - CAnalyzer& rAnalyzer, - CBufferDecoder& rDecoder); - - - -}; - - -#endif Copied: trunk/SpecTcl/ccusb/CCUSBUnpacker.h (from rev 2014, branches/3.3-009-development/ccusb/CCUSBUnpacker.h) =================================================================== --- trunk/SpecTcl/ccusb/CCUSBUnpacker.h (rev 0) +++ trunk/SpecTcl/ccusb/CCUSBUnpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,73 @@ +#ifndef __CCUSBUNPACKER_H +#define __CCUSBUNPACKER_H +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ + + +#ifndef __EVENTPROCESSOR_H +#include <EventProcessor.h> +#endif + + +/*! + Unpack data from the CCUSB when it contains a bunch of + data from Phillips modules. All phillips modules are assumed + to be configured to at least insert a channel hit pattern and are + in zero suppressed mode. This implies that the hit pattern tells us how + many channels are present in the data. Each channel includes a channel number tag + in the top 4 bits that, along with the position of the module in the data stream + unambiguously determines the channel. + + The parammap command is used to describe the correspondence between + module/channel and SpecTcl parameters. We can fetch from this map from the + parammap command singleton in terms of parameter ids which makes the unpacking + of a module relatively trivial. + + The format of a single event is: +\verbatim + + +-------------------+ + | event word count | + +-------------------+ + | id for first mod | + +-------------------+ + | Data from first | + | module | + | /\/\/\/\/\ + +-------------------+ + | id for second mod | + etc. + +\endverbatim + +\note the event word count is not self inclusive + +*/ + +class CCUSBUnpacker : public CEventProcessor +{ +public: + virtual Bool_t operator()(const Address_t pEvent, + CEvent& rEvent, + CAnalyzer& rAnalyzer, + CBufferDecoder& rDecoder); + + + +}; + + +#endif Deleted: trunk/SpecTcl/ccusb/CFixedSizedUnpacker.cpp =================================================================== --- branches/3.3-009-development/ccusb/CFixedSizedUnpacker.cpp 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CFixedSizedUnpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,73 +0,0 @@ -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ -#include <config.h> -#include "CFixedSizedUnpacker.h" -#include <Event.h> -#include <vector> -#include <stdint.h> - -using namespace std; - -/*! - Construction saves the number of data words in the payload section: - @param numWords - Number of words in the data payload. -*/ -CFixedSizedUnpacker::CFixedSizedUnpacker(int numWords) : - m_numWords(numWords) {} - -/*! - Unpack a block of data that looks like: - -\verbatim - +-----------------------+ - | id | - +-----------------------+ - | Channel 0 data | - +-----------------------+ - ... . ... - | Channel n data | - +-----------------------+ -\endverbatim - - @param p - Translator pointer that gets us at the data - (the id is presumed to have been previously validated). - @param pModuleInfo - Pointer to the module info (which includes the - channel-> parameter map. - @param rEvent - Reference to the channel -> parametr map. - @return int - @retval Number of words actually consumed (1 + m_numWords) - -*/ -int -CFixedSizedUnpacker::unpack(TranslatorPointer<UShort_t> p, - const CParamMapCommand::ParameterMap* pModuleInfo, - CEvent& rEvent) -{ - ++p; - const vector<int>& parameterMap = pModuleInfo->s_parameterIds; - - for (int chan =0; chan < m_numWords; chan++) { - uint16_t datum = *p; ++p; - if (parameterMap.size() > chan) { - int param = parameterMap[chan]; - if (param >= 0) { - rEvent[param] = datum; - } - } - } - - return m_numWords + 1; -} Copied: trunk/SpecTcl/ccusb/CFixedSizedUnpacker.cpp (from rev 2014, branches/3.3-009-development/ccusb/CFixedSizedUnpacker.cpp) =================================================================== --- trunk/SpecTcl/ccusb/CFixedSizedUnpacker.cpp (rev 0) +++ trunk/SpecTcl/ccusb/CFixedSizedUnpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,73 @@ +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ +#include <config.h> +#include "CFixedSizedUnpacker.h" +#include <Event.h> +#include <vector> +#include <stdint.h> + +using namespace std; + +/*! + Construction saves the number of data words in the payload section: + @param numWords - Number of words in the data payload. +*/ +CFixedSizedUnpacker::CFixedSizedUnpacker(int numWords) : + m_numWords(numWords) {} + +/*! + Unpack a block of data that looks like: + +\verbatim + +-----------------------+ + | id | + +-----------------------+ + | Channel 0 data | + +-----------------------+ + ... . ... + | Channel n data | + +-----------------------+ +\endverbatim + + @param p - Translator pointer that gets us at the data + (the id is presumed to have been previously validated). + @param pModuleInfo - Pointer to the module info (which includes the + channel-> parameter map. + @param rEvent - Reference to the channel -> parametr map. + @return int + @retval Number of words actually consumed (1 + m_numWords) + +*/ +int +CFixedSizedUnpacker::unpack(TranslatorPointer<UShort_t> p, + const CParamMapCommand::ParameterMap* pModuleInfo, + CEvent& rEvent) +{ + ++p; + const vector<int>& parameterMap = pModuleInfo->s_parameterIds; + + for (int chan =0; chan < m_numWords; chan++) { + uint16_t datum = *p; ++p; + if (parameterMap.size() > chan) { + int param = parameterMap[chan]; + if (param >= 0) { + rEvent[param] = datum; + } + } + } + + return m_numWords + 1; +} Deleted: trunk/SpecTcl/ccusb/CFixedSizedUnpacker.h =================================================================== --- branches/3.3-009-development/ccusb/CFixedSizedUnpacker.h 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CFixedSizedUnpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,45 +0,0 @@ -#ifndef __CFIXEDSIZEDUNPACKER_H -#define __CFIXEDSIZEDUNPACKER_H - -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ - -#ifndef __CCCUSBPACKET_H -#include "CCCUSBPacket.h" -#endif - -class CEvent; - -/*! - This class will work with a wide variety of module types. - It assumes that the data from a module is a fixed sized block of channels - read in order from channel 0 -> channel n -*/ - - -class CFixedSizedUnpacker : public CCCUSBPacket -{ -private: - int m_numWords; - -public: - CFixedSizedUnpacker(int numWords); - int unpack(TranslatorPointer<UShort_t> p, - const CParamMapCommand::ParameterMap* pModuleInfo, - CEvent& rEvent); -}; - -#endif Copied: trunk/SpecTcl/ccusb/CFixedSizedUnpacker.h (from rev 2014, branches/3.3-009-development/ccusb/CFixedSizedUnpacker.h) =================================================================== --- trunk/SpecTcl/ccusb/CFixedSizedUnpacker.h (rev 0) +++ trunk/SpecTcl/ccusb/CFixedSizedUnpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,45 @@ +#ifndef __CFIXEDSIZEDUNPACKER_H +#define __CFIXEDSIZEDUNPACKER_H + +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ + +#ifndef __CCCUSBPACKET_H +#include "CCCUSBPacket.h" +#endif + +class CEvent; + +/*! + This class will work with a wide variety of module types. + It assumes that the data from a module is a fixed sized block of channels + read in order from channel 0 -> channel n +*/ + + +class CFixedSizedUnpacker : public CCCUSBPacket +{ +private: + int m_numWords; + +public: + CFixedSizedUnpacker(int numWords); + int unpack(TranslatorPointer<UShort_t> p, + const CParamMapCommand::ParameterMap* pModuleInfo, + CEvent& rEvent); +}; + +#endif Deleted: trunk/SpecTcl/ccusb/CPh7xxUnpacker.cpp =================================================================== --- branches/3.3-009-development/ccusb/CPh7xxUnpacker.cpp 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CPh7xxUnpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,95 +0,0 @@ -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ - -#include <config.h> -#include "CPh7xxUnpacker.h" -#include <stdint.h> -#include <vector> -#include "Event.h" - -using namespace std; - -// Simple utility functions (macros) - -// Channel field of the data: - -static inline int Channel(uint16_t datum) -{ - return (datum >> 12) & 0xf; -} - -// Conversion field of the data: - -static inline int Value(uint16_t datum) -{ - return (datum & 0xfff); -} - -/*! - Unpack data from a Ph7xxx module. The data packet from this module - is assumed to be of the form: - -\verbatim - +----------------------+ - | Packet id | - +----------------------+ - | hit pattern | - +----------------------+ - | channel data... | - ... ... - +----------------------+ - -\endverbatim -Assumptions: - - The module is configured to read the hit pattern. - - The module is read zero suppressed. - - The caller has verified the id is correct for us. - - @param p - Byte order translating pointer to the raw event. - @param pModuleInfo - Pointer to the module info structure. - this includes the channel->parameter map. - @param rEvent - Reference to the unpacked paramter vector. - @return int - @retval Number of words of data consumed by this unpacker. -*/ -int -CPh7xxxUnpacker:: unpack(TranslatorPointer<UShort_t> p, - const CParamMapCommand::ParameterMap* pModuleInfo, - CEvent& rEvent) -{ - ++p; // Skip over the id. - uint16_t hitPattern = *p; ++p; // Use the hit pattern to get the data count: - uint16_t channels = bitsInMask(hitPattern); - - const vector<int>& parameters = pModuleInfo->s_parameterIds; - - for (int i =0; i < channels; i++) { - uint16_t datum = *p; ++p; - int channel = Channel(datum); - if (parameters.size() > channel) { - int param = parameters[channel]; - if (param >= 0) { - rEvent[param] = Value(datum); - } - - } - } - - // we consumed the id the bit mask (2) and channels words: - - - return 2 + channels; -} Copied: trunk/SpecTcl/ccusb/CPh7xxUnpacker.cpp (from rev 2014, branches/3.3-009-development/ccusb/CPh7xxUnpacker.cpp) =================================================================== --- trunk/SpecTcl/ccusb/CPh7xxUnpacker.cpp (rev 0) +++ trunk/SpecTcl/ccusb/CPh7xxUnpacker.cpp 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,95 @@ +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ + +#include <config.h> +#include "CPh7xxUnpacker.h" +#include <stdint.h> +#include <vector> +#include "Event.h" + +using namespace std; + +// Simple utility functions (macros) + +// Channel field of the data: + +static inline int Channel(uint16_t datum) +{ + return (datum >> 12) & 0xf; +} + +// Conversion field of the data: + +static inline int Value(uint16_t datum) +{ + return (datum & 0xfff); +} + +/*! + Unpack data from a Ph7xxx module. The data packet from this module + is assumed to be of the form: + +\verbatim + +----------------------+ + | Packet id | + +----------------------+ + | hit pattern | + +----------------------+ + | channel data... | + ... ... + +----------------------+ + +\endverbatim +Assumptions: + - The module is configured to read the hit pattern. + - The module is read zero suppressed. + - The caller has verified the id is correct for us. + + @param p - Byte order translating pointer to the raw event. + @param pModuleInfo - Pointer to the module info structure. + this includes the channel->parameter map. + @param rEvent - Reference to the unpacked paramter vector. + @return int + @retval Number of words of data consumed by this unpacker. +*/ +int +CPh7xxxUnpacker:: unpack(TranslatorPointer<UShort_t> p, + const CParamMapCommand::ParameterMap* pModuleInfo, + CEvent& rEvent) +{ + ++p; // Skip over the id. + uint16_t hitPattern = *p; ++p; // Use the hit pattern to get the data count: + uint16_t channels = bitsInMask(hitPattern); + + const vector<int>& parameters = pModuleInfo->s_parameterIds; + + for (int i =0; i < channels; i++) { + uint16_t datum = *p; ++p; + int channel = Channel(datum); + if (parameters.size() > channel) { + int param = parameters[channel]; + if (param >= 0) { + rEvent[param] = Value(datum); + } + + } + } + + // we consumed the id the bit mask (2) and channels words: + + + return 2 + channels; +} Deleted: trunk/SpecTcl/ccusb/CPh7xxUnpacker.h =================================================================== --- branches/3.3-009-development/ccusb/CPh7xxUnpacker.h 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/CPh7xxUnpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,38 +0,0 @@ -#ifndef __CPH7XXUNPACKER_H -#define __CPH7XXUNPACKER_H - -/* - This software is Copyright by the Board of Trustees of Michigan - State University (c) Copyright 2005. - - You may use this software under the terms of the GNU public license - (GPL). The terms of this license are described at: - - http://www.gnu.org/licenses/gpl.txt - - Author: - Ron Fox - NSCL - Michigan State University - East Lansing, MI 48824-1321 -*/ - -#ifndef __CCCUSBPACKET_H -#include "CCCUSBPacket.h" -#endif - -class CEvent; - - -/*! - This class is intended to unpack data from the - Phillips 7xxx series of digitizers. - -*/ -class CPh7xxxUnpacker : public CCCUSBPacket -{ - int unpack(TranslatorPointer<UShort_t> p, - const CParamMapCommand::ParameterMap* pModuleInfo, - CEvent& rEvent); -}; -#endif Copied: trunk/SpecTcl/ccusb/CPh7xxUnpacker.h (from rev 2014, branches/3.3-009-development/ccusb/CPh7xxUnpacker.h) =================================================================== --- trunk/SpecTcl/ccusb/CPh7xxUnpacker.h (rev 0) +++ trunk/SpecTcl/ccusb/CPh7xxUnpacker.h 2012-06-08 13:25:55 UTC (rev 2015) @@ -0,0 +1,38 @@ +#ifndef __CPH7XXUNPACKER_H +#define __CPH7XXUNPACKER_H + +/* + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2005. + + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: + + http://www.gnu.org/licenses/gpl.txt + + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 +*/ + +#ifndef __CCCUSBPACKET_H +#include "CCCUSBPacket.h" +#endif + +class CEvent; + + +/*! + This class is intended to unpack data from the + Phillips 7xxx series of digitizers. + +*/ +class CPh7xxxUnpacker : public CCCUSBPacket +{ + int unpack(TranslatorPointer<UShort_t> p, + const CParamMapCommand::ParameterMap* pModuleInfo, + CEvent& rEvent); +}; +#endif Deleted: trunk/SpecTcl/ccusb/Makefile.am =================================================================== --- branches/3.3-009-development/ccusb/Makefile.am 2012-06-08 13:20:45 UTC (rev 2014) +++ trunk/SpecTcl/ccusb/Makefile.am 2012-06-08 13:25:55 UTC (rev 2015) @@ -1,91 +0,0 @@ -bin_PROGRAMS=CCUSBSpecTcl - -CCUSBSpecTcl_SOURCES=CC1205Unpacker.cpp \ - CCCUSBPacket.cpp \ - CCUSBUnpacker.cpp \ - CFixedSizedUnpacker.cpp \ - CPh7xxUnpacker.cpp \ - MySpecTclApp.cpp \ - ParamMapCommand.cpp - -noinst_HEADERS=CC1205Unpacker.h \ - CCCUSBPacket.h \ - CCUSBUnpacker.h \ - CFixedSizedUnpacker.h \ - CPh7xxUnpacker.h \ - MySpecTclApp.h \ - ParamMapCommand.h - - -INCLUDES = -I. -I@top_srcdir@ -I@top_srcdir@/TCL -I@top_srcdir@/Events \ - -I@top_srcdir@/Utility -I@top_srcdir@/Sorter \ - -I@top_srcdir@/NSCLException \ - -I@top_srcdir@/EventSource -I@top_srcdir@/Gates \ - -I@top_srcdir@/SpectrumIO -I@top_srcdir@/Xamine -I@top_srcdir@/SpecTcl \ - -I@top_srcdir@/Analysis \ - -I@top_srcdir@/Display -I@top_srcdir@/Tape -I@top_srcdir@/Filter \ - -I@top_srcdir@/TreeParam \ - @TCL_FLAGS@ -DINSTALLED_IN='"$(prefix)"' @XINCLUDES@ - -CCUSBSpecTcl_LDFLAGS = ../Events/libAnalysis.la \ - ../Fits/libFits.la \ - ../TCL/libtclPlus.la \ - ../Analysis/libBufferAnalysis.la \ - ../EventSource/libEventSource.la \ - ../Tape/libtape.la \ - ../Gates/libGates.la \ - ../Replace/libreplace.la \ - ../Xamine/libXplus.la \ - ../calibratedparams/libCalibrations.la \ - ../Sor... [truncated message content] |
From: <ro...@us...> - 2012-06-15 20:41:24
|
Revision: 2033 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=2033&view=rev Author: ron-fox Date: 2012-06-15 20:41:14 +0000 (Fri, 15 Jun 2012) Log Message: ----------- Merged 3.3-010 development branch Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Gui/browser.tcl trunk/SpecTcl/Gui/datasource.tcl trunk/SpecTcl/Gui/folderGui.tcl trunk/SpecTcl/Gui/guistate.tcl trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp trunk/SpecTcl/SpecTcl/TclGrammerApp.h trunk/SpecTcl/TCL/TCLException.cpp trunk/SpecTcl/TCL/TCLException.h trunk/SpecTcl/TCL/TCLInterpreter.cpp trunk/SpecTcl/ccusb/SpecTclRC.tcl trunk/SpecTcl/configure.ac trunk/SpecTcl/gri-2.12.20/Makefile.in trunk/SpecTcl/gri-2.12.20/aclocal.m4 trunk/SpecTcl/gri-2.12.20/configure trunk/SpecTcl/gri-2.12.20/debian/Makefile.in trunk/SpecTcl/gri-2.12.20/debian/source/Makefile.in trunk/SpecTcl/gri-2.12.20/doc/Makefile.in trunk/SpecTcl/gri-2.12.20/doc/examples/Makefile.in trunk/SpecTcl/gri-2.12.20/doc/index.html trunk/SpecTcl/gri-2.12.20/doc/refcard.dvi trunk/SpecTcl/gri-2.12.20/doc/refcard.log trunk/SpecTcl/gri-2.12.20/doc/refcard.ps trunk/SpecTcl/gri-2.12.20/doc/resources/Makefile.in trunk/SpecTcl/gri-2.12.20/doc/screenshots/Makefile.in trunk/SpecTcl/gri-2.12.20/doc/stamp-vti trunk/SpecTcl/gri-2.12.20/doc/tst_suite/Makefile.in trunk/SpecTcl/gri-2.12.20/doc/version.texi trunk/SpecTcl/gri-2.12.20/src/Makefile.in trunk/SpecTcl/gri-2.12.20/src/popt/Makefile.in trunk/SpecTcl/treegui/treeGui.tcl trunk/SpecTcl/treegui/treeUtilities.tcl Property Changed: ---------------- trunk/SpecTcl/ Property changes on: trunk/SpecTcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.3-007-dev:1983-1986 /branches/3.3-008-dev:1987-1996 /branches/3.3-009-development:2000-2014 + /branches/3.3-007-dev:1983-1986 /branches/3.3-008-dev:1987-1996 /branches/3.3-009-development:2000-2014 /branches/SpecTcl-3.3-010-development:2016-2031 Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/CHANGELOG 2012-06-15 20:41:14 UTC (rev 2033) @@ -966,3 +966,18 @@ - June 6, 2012 - Added vmusbSpecTcl to the build. - June 6, 2012 Tell user about missing parameters array elements. - June 6, 2012 VMUSBSpecTcl - process madc -resolution config option. +3.3-010 + - June 8, 2012 Branched the development repository and upped the + configure.ac version to 3.3-010 + - June 11, 2012 Issue #1089 fix order of gui startup with respect + to config file processing. + - June 11, 2012 Issue #1087 correct handling when saving gates for + gates that have spaces in their name. + - June 14, 2012 Issue #1008 Provide error information and exit if SpecTclRC.tcl + or SpecTclInit.tcl failed. + - June 14, 2012 Issue #1070 Provide error information for failing Pseudo params. + - June 15, 2012 Issue #1046: + * Default to ring format if online. + * Allow user to specify ring name. + + - June 15, 2012 Issue #1063 Improve new gui startup time. Modified: trunk/SpecTcl/Gui/browser.tcl =================================================================== --- trunk/SpecTcl/Gui/browser.tcl 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/Gui/browser.tcl 2012-06-15 20:41:14 UTC (rev 2033) @@ -221,9 +221,10 @@ # Fill the subfolders (we're hog wild assuming this is SpecTcl - $self fillAllFolders - $self fillAllFolders; # Second time shakes the unparented guys after the folders. + set timing [time {$self fillAllFolders} 1] + + # Event bindings for elements: $win.tree bind gate <Button-1> +[mymethod selectElement %x %y] @@ -320,6 +321,7 @@ # method fillParameterFolder {} { catch {$win.tree delete parameter} + set timing [time { foreach parameter [parameter -list] { if {$options(-filterparameters) != ""} { if {![eval $options(-filterparameters) [list $parameter]]} { @@ -332,12 +334,12 @@ set parentPath [split $name .] set parentPath [lrange $parentPath 0 end-1] set parentPath [join $parentPath .] - if {[catch {set parentPaths($parentPath)}] } { + if {[array names parentPaths $parentPath)] eq "" } { $self makeParents $name } set id [$win.tree insert end $name] - $win.tree entry configure $id -icons {::browser::paramicon ::browser::paramicon} \ + $win.tree entry configure $id -icons {::browser::paramicon ::browser::paramicon} \ -activeicons {::browser::paramicon ::browser::paramicon} $win.tree tag add parameter $id $win.tree entry configure $id -bindtags [list parameter all] @@ -364,7 +366,8 @@ } } } - } + }} 1] + } # fillVariableFolder # Fills the variable folder with the set of treevariables that are now defined. @@ -1180,6 +1183,9 @@ # proc nameToPath {prefix name} { set path $prefix + append path . [regsub {\.} $name _BLTFOLDER.] + return $path + set nameList [split $name .] foreach folder [lrange $nameList 0 end-1] { append path . $folder _BLTFOLDER Modified: trunk/SpecTcl/Gui/datasource.tcl =================================================================== --- trunk/SpecTcl/Gui/datasource.tcl 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/Gui/datasource.tcl 2012-06-15 20:41:14 UTC (rev 2033) @@ -32,6 +32,7 @@ variable warnedFilters 0 variable lastFilterFile {} variable actualSpecTclDaq {} + variable lastring $::tcl_platform(user) } # datasource::findSpecTclDaq @@ -84,21 +85,28 @@ # proc attachOnline {} { hostprompt .hostprompt -host $::datasource::lasthost \ - -format $::datasource::lastformat \ - -buffersize $::GuiPrefs::preferences(defaultBuffersize) + -format ::datasource::lastformat \ + -buffersize $::GuiPrefs::preferences(defaultBuffersize) \ + -ringname $::datasource::lastring .hostprompt modal if {[winfo exists .hostprompt]} { set host [.hostprompt cget -host] if {$host != ""} { set format [.hostprompt cget -format] + set additionalInfo {} + if {$format eq "ring"} { + set additionalInfo [.hostprompt cget -ringname] + set ::datasource::lastring $additionalInfo + } set ::datasource::lasthost $host set ::datasource::lastformat $format + set size [.hostprompt cget -buffersize] - set helper [.hostprompt onlinehelper $host] - + set helper [.hostprompt onlinehelper $host $additionalInfo] + catch stop attach -format $format -size $size -pipe $helper set ::GuiPrefs::preferences(defaultBuffersize) $size @@ -334,19 +342,26 @@ snit::widget formatChooser { variable formats {nscl jumbo ring}; # Valid options option -format nscl; # Default option. + option -command [list]; # Command to call if format changes. constructor args { - $self configurelist $args - + set col 0 foreach format $formats { - radiobutton $win.$format -variable ${selfns}::options(-format) \ - -value $format -text $format + radiobutton $win.$format -variable [myvar options(-format)] \ + -value $format -text $format -command [mymethod dispatch] grid $win.$format -sticky w -row 0 -column $col incr col } - + $self configurelist $args + + set initialFormat $options(-format) + after 1 [list $win.$initialFormat select]; # Not sure why this must be scheduled(?) } + destructor { + error "Destroying formatchooser" + } + # # Return help text for the formats # @@ -364,8 +379,8 @@ # by that name.. The assumption is also that the # caller will figure out the directory part of the path. # - method onlinehelper {host} { - return [$self $options(-format) $host] + method onlinehelper {host {other {}}} { + return [$self $options(-format) $host $other] } #----------------------------------------------------------------- @@ -373,9 +388,19 @@ # Private methods # + # Dispatch the -command switch. The reciever will get the new + # format value + + method dispatch {} { + set command $options(-command) + if {$command ne ""} { + uplevel #0 $command $options(-format) + } + } + # Construct the helper program line for spectrodaq online - method spectrodaq {host} { + method spectrodaq {host {ignored {}}} { # # Really dirty: @@ -386,12 +411,12 @@ # Construct the helper program for nscl format - method nscl {host} { + method nscl {host {ignored {}}} { return [$self spectrodaq $host] } # Construct the helper program for jumbo format: - method jumbo {host} { + method jumbo {host {ignored {}}} { return [$self spectrodaq $host] } @@ -403,8 +428,11 @@ # - Look for it in /usr/opt/daq/current/bin : if present use that one. # - Look for it in /usr/opt/daq/1*.* sorted descdending and take the first one. # - method ring {host} { - set url "tcp://$host/$::tcl_platform(user)" + method ring {host {ringname ""}} { + if {$ringname eq ""} { + set ringname $::tcl_platform(user) + } + set url "tcp://$host/$ringname" set selection "--sample=PHYSICS_EVENT" set ringselector /usr/opt/daq/current/bin/ringselector @@ -440,6 +468,8 @@ snit::widget hostprompt { hulltype toplevel option -host {} + option -ringname -default $::tcl_platform(user) -configuremethod ringChanged \ + -cgetmethod getRing option -okcommand {} option -cancelcommand {} option -buffersize 8192 @@ -453,25 +483,29 @@ constructor args { label $win.hostlabel -text Host: entry $win.host + label $win.ringlabel -text {Ring:} + entry $win.ring + spinbox $win.buffersize -values {512 1024 2048 4096 8192 16384 32768 65536} label $win.buflabel -text {Buffer size in bytes: } $win.buffersize set $options(-buffersize) label $win.fmtlabel -text {Data format} - install format using formatChooser $win.format - + install format using formatChooser $win.fmt -command [mymethod formatChanged] -format ring button $win.ok -text Ok -command [mymethod onOk] button $win.cancel -text Cancel -command [mymethod onCancel] button $win.help -text Help -command [list spectclGuiDisplayHelpTopic hostPrompt] - - + grid $win.hostlabel $win.host + grid $win.ringlabel $win.ring grid $win.buflabel $win.buffersize grid $win.fmtlabel - grid $win.format + grid $win.fmt grid $win.ok $win.cancel $win.help + $self configurelist $args + } # modal # Turns this into a modal dialog. @@ -542,6 +576,33 @@ oncget -buffersize { return [$win.buffersize get] } + ## + # the ring name changed...update the entry: + # + method ringChanged {option value} { + $win.ring delete 0 end + $win.ring insert end $value + set options($option) $value + } + ## + # get the ring from the entry: + # + method getRing {option} { + return [$win.ring get] + } + ## + # The format changed. If the format is 'ring' we can + # enable the ring label/entry...otherwise disable them + # + method formatChanged newFormat { + if {$newFormat eq "ring"} { + $win.ringlabel configure -state normal + $win.ring configure -state normal + } else { + $win.ringlabel configure -state disable + $win.ring configure -state disable + } + } } # attachpipe: Modified: trunk/SpecTcl/Gui/folderGui.tcl =================================================================== --- trunk/SpecTcl/Gui/folderGui.tcl 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/Gui/folderGui.tcl 2012-06-15 20:41:14 UTC (rev 2033) @@ -1110,7 +1110,7 @@ - + set timing [time { browser $parent.b -spectrumfoldercommand spectrumFolderContextMenu \ -parameterfoldercommand parameterFolderContextMenu \ -gatefoldercommand gateFolderContextMenu \ @@ -1122,6 +1122,8 @@ -spectrumrightclick spectrumContextMenu \ -parameterrightclick parameterContextMenu \ -gaterightclick gateContextMenu + } 1] + pack $parent.b -fill both -expand 1 Modified: trunk/SpecTcl/Gui/guistate.tcl =================================================================== --- trunk/SpecTcl/Gui/guistate.tcl 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/Gui/guistate.tcl 2012-06-15 20:41:14 UTC (rev 2033) @@ -297,7 +297,7 @@ if {!$::guistate::gatestatus($name)} { set dependencies [getDependentGates $description] foreach dependency $dependencies { - set depname [lindex $dependency 0] + set depname $dependency if {!$::guistate::gatestatus($depname)} { writeGate $fd [lindex [gate -list $dependency] 0] } Modified: trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp =================================================================== --- trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp 2012-06-15 20:41:14 UTC (rev 2033) @@ -54,6 +54,8 @@ #include <CTreeVariableCommand.h> #include <CTreeParameter.h> #include <CTreeVariable.h> +#include <TCLException.h> + #include "CFoldCommand.h" #include "CFitCommand.h" @@ -72,6 +74,9 @@ #include <string> #include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> #if defined(Darwin) #include <sys/syslimits.h> @@ -253,32 +258,38 @@ // $SpecTclHome/Scripts // ~ // . - try { // Try from SpecTcl library dir. - string AppFilename(kpInstalledBase); - AppFilename += kpAppInitSubDir; - AppFilename += kpAppInitFile; - rInterpreter.EvalFile(AppFilename); + + string AppFilename(kpInstalledBase); + AppFilename += kpAppInitSubDir; + AppFilename += kpAppInitFile; + std::string result = SourceOptionalFile(rInterpreter, AppFilename); + if (result != "") { + std::cerr << result << std::endl; + exit(-1); } - catch(...) { // Errors are silently ignored. - } + if(getenv("HOME")) { // Need home env variable. - try { // Try from user's home dir: - string AppFilename(getenv("HOME")); - AppFilename += kpAppInitFile; - rInterpreter.EvalFile(AppFilename); + + string AppFilename(getenv("HOME")); + AppFilename += kpAppInitFile; + result = SourceOptionalFile(rInterpreter, AppFilename); + if (result != "") { + std::cerr << result << std::endl; + exit(-1); } - catch(...) { - } + } - try { // Try the cwd. - string AppFilename("."); - AppFilename += kpAppInitFile; - rInterpreter.EvalFile(AppFilename); + + AppFilename = "."; + AppFilename += kpAppInitFile; + result = SourceOptionalFile(rInterpreter, AppFilename); + if (result != "") { + std::cerr << result << std::endl; + exit(-1); } - catch(...) { - } + } // Function: @@ -573,23 +584,27 @@ */ void CTclGrammerApp::SourceFunctionalScripts(CTCLInterpreter& rInterp) { - try { // First run the ~ script: - if(getenv("HOME")) { - string RCFilename(getenv("HOME")); - RCFilename += kpUserInitFile; - rInterp.EvalFile(RCFilename); + std::string result; + if(getenv("HOME")) { + string RCFilename(getenv("HOME")); + RCFilename += kpUserInitFile; + result = SourceOptionalFile(rInterp, RCFilename); + if (result != "") { + std::cerr << result << std::endl; + exit(-1); } } - catch (...) { - } - try { - string RCFilename("."); - RCFilename += kpUserInitFile; - rInterp.EvalFile(RCFilename); + + + string RCFilename("."); + RCFilename += kpUserInitFile; + result = SourceOptionalFile(rInterp, RCFilename); + if (result != "") { + std::cerr << result << std::endl; + exit(-1); } - catch (...) { - } + } // Function: @@ -710,3 +725,62 @@ } // No update. } +/** + * Utility funtion that sources Tcl optional sript. The script is optional in the sense + * that file not found errors are not reported. What is reported are: + * - File not readable (exists but no read access). + * - Errors from the script itself. + * + * @param rInterp - Reference to the Tcl interpreter that should source the file. + * @param filename -name of the script to check. + * + * @return std::string + * @retval empty string if no error or file not found. + * @retval reason for the error if there was one. + */ +std::string +CTclGrammerApp::SourceOptionalFile(CTCLInterpreter& rInterp, std::string filename) +{ + // Probe existence and return empty if not found. + + int stat = access(filename.c_str(), F_OK); + if (stat && (errno == ENOENT)) { + return std::string(""); + } + if (stat) { + std::string reason = string(strerror(errno)); + std::string error = "Existence check for "; + error += filename; + error += " failed: "; + error += reason; + return error; + } + + // Probe readabilty and return an error if not readable. + + if (access(filename.c_str(), R_OK)) { + std::string reason = std::string(strerror(errno)); + std::string error = "Readability check failed for "; + error += filename; + error += " : "; + error += reason; + return error; + } + + // Source the script converting an exception in to an error messasge. + // error message will include the error info too. + + try { + rInterp.EvalFile(filename); + return std::string(""); + } + catch (CTCLException& e) { + std::string reason = e.ReasonText(); + std::string error = "Error processing file: "; + error += filename; + error += " "; + error += reason; + return error; + } + +} Modified: trunk/SpecTcl/SpecTcl/TclGrammerApp.h =================================================================== --- trunk/SpecTcl/SpecTcl/TclGrammerApp.h 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/SpecTcl/TclGrammerApp.h 2012-06-15 20:41:14 UTC (rev 2033) @@ -1,283 +1,19 @@ /* - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2008 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: - Preamble + http://www.gnu.org/licenses/gpl.txt - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public - License is intended to guarantee your freedom to share and change free - software--to make sure the software is free for all its users. This - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by - the GNU Library General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not - price. Our General Public Licenses are designed to make sure that you - have the freedom to distribute copies of free software (and charge for - this service if you wish), that you receive source code or can get it - if you want it, that you can change the software or use pieces of it - in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid - anyone to deny you these rights or to ask you to surrender the rights. - These restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether - gratis or for a fee, you must give the recipients all the rights that - you have. You must make sure that they, too, receive or can get the - source code. And you must show them these terms so they know their - rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software - patents. We wish to avoid the danger that redistributors of a free - program will individually obtain patent licenses, in effect making the - program proprietary. To prevent this, we have made it clear that any - patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains - a notice placed by the copyright holder saying it may be distributed - under the terms of this General Public License. The "Program", below, - refers to any such program or work, and a "work based on the Program" - means either the Program or any derivative work under copyright law: - that is to say, a work containing the Program or a portion of it, - either verbatim or with modifications and/or translated into another - language. (Hereinafter, translation is included without limitation in - the term "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of - running the Program is not restricted, and the output from the Program - is covered only if its contents constitute a work based on the - Program (independent of having been made by running the Program). - Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's - source code as you receive it, in any medium, provided that you - conspicuously and appropriately publish on each copy an appropriate - copyright notice and disclaimer of warranty; keep intact all the - notices that refer to this License and to the absence of any warranty; - and give any other recipients of the Program a copy of this License - along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion - of it, thus forming a work based on the Program, and copy and - distribute such modifications or work under the terms of Section 1 - above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, - and can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based - on the Program, the distribution of the whole must be on the terms of - this License, whose permissions for other licensees extend to the - entire whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of - a storage or distribution medium does not bring the other work under - the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source - code means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to - control compilation and installation of the executable. However, as a - special exception, the source code distributed need not include - anything that is normally distributed (in either source or binary - form) with the major components (compiler, kernel, and so on) of the - operating system on which the executable runs, unless that component - itself accompanies the executable. - - If distribution of executable or object code is made by offering - access to copy from a designated place, then offering equivalent - access to copy the source code from the same place counts as - distribution of the source code, even though third parties are not - compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense or distribute the Program is - void, and will automatically terminate your rights under this License. - However, parties who have received copies, or rights, from you under - this License will not have their licenses terminated so long as such - parties remain in full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and - all its terms and conditions for copying, distributing or modifying - the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further - restrictions on the recipients' exercise of the rights granted herein. - You are not responsible for enforcing compliance by third parties to - this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot - distribute so as to satisfy simultaneously your obligations under this - License and any other pertinent obligations, then as a consequence you - may not distribute the Program at all. For example, if a patent - license would not permit royalty-free redistribution of the Program by - all those who receive copies directly or indirectly through you, then - the only way you could satisfy both it and this License would be to - refrain entirely from distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is - implemented by public license practices. Many people have made - generous contributions to the wide range of software distributed - through that system in reliance on consistent application of that - system; it is up to the author/donor to decide if he or she is willing - to distribute software through any other system and a licensee cannot - impose that choice. - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License - may add an explicit geographical distribution limitation excluding - those countries, so that distribution is permitted only in or among - countries not thus excluded. In such case, this License incorporates - the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions of the - General Public License from time to time. Such new versions will be similar - in spirit to the present version, but may differ in detail to address new - problems or concerns. - - Each version is given a distinguishing version number. If the Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and conditions - either of that version or of any later version published by the Free Software - Foundation. If the Program does not specify a version number of this License, - you may choose any version ever published by the Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the author to - ask for permission. For software which is copyrighted by the Free Software - Foundation, write to the Free Software Foundation; we sometimes make - exceptions for this. Our decision will be guided by the two goals of - preserving the free status of all derivatives of our free software and of - promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR - THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN - OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE - THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND - PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, - YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING - WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR - REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, - INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING - OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO - LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR - THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), - EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - - END OF TERMS AND CONDITIONS ' + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 */ + // Class: CTclGrammerApp //ANSI C++ // File: TclGrammerApp /* @@ -307,6 +43,13 @@ #endif #endif +#ifndef __STL_STRING +#include <string> +#ifndef __STL_STRING +#define __STL_STRING +#endif +#endif + #ifndef __TCLVARIABLE_H #include <TCLVariable.h> #endif @@ -535,6 +278,7 @@ // Utilities: protected: static void UpdateUInt(CTCLVariable& rVar, UInt_t& rValue); + static std::string SourceOptionalFile(CTCLInterpreter& rInterp, std::string filename); }; #endif Modified: trunk/SpecTcl/TCL/TCLException.cpp =================================================================== --- trunk/SpecTcl/TCL/TCLException.cpp 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/TCL/TCLException.cpp 2012-06-15 20:41:14 UTC (rev 2033) @@ -1,280 +1,19 @@ /* - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + This software is Copyright by the Board of Trustees of Michigan + State University (c) Copyright 2008 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + You may use this software under the terms of the GNU public license + (GPL). The terms of this license are described at: - Preamble + http://www.gnu.org/licenses/gpl.txt - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of this License, - you may choose any version ever published by the Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author to -ask for permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make -exceptions for this. Our decision will be guided by the two goals of -preserving the free status of all derivatives of our free software and of -promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE -THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO -LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR -THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS ' + Author: + Ron Fox + NSCL + Michigan State University + East Lansing, MI 48824-1321 */ + static const char* Copyright = "(C) Copyright Michigan State University 2015, All rights reserved"; // CTCLException.cpp // Encapsulates an exception which can be @@ -377,9 +116,29 @@ { // Returns a pointer to the reason for the // failure. This is currently the Result string. +// Traceback etc depend on not doing any other Tcl script eval.. - return m_ResultText.c_str(); + static std::string result = m_ResultText.c_str(); + result += " "; + result += CException::WasDoing(); + // Get the stack trace. + + Tcl_Interp* pInterp = getInterpreter()->getInterpreter(); + + Tcl_Obj* options = Tcl_GetReturnOptions(pInterp, TCL_ERROR); + Tcl_Obj* key = Tcl_NewStringObj("-errorinfo", -1); + Tcl_Obj* stackTrace; + Tcl_IncrRefCount(key); + Tcl_DictObjGet(NULL, options, key, &stackTrace); + + result += " "; + result += Tcl_GetStringFromObj(stackTrace, NULL); + Tcl_DecrRefCount(key); + + + return result.c_str(); + } ////////////////////////////////////////////////////////////////////////// // Modified: trunk/SpecTcl/TCL/TCLException.h =================================================================== --- trunk/SpecTcl/TCL/TCLException.h 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/TCL/TCLException.h 2012-06-15 20:41:14 UTC (rev 2033) @@ -301,6 +301,11 @@ #include "TCLResult.h" #endif + +#ifndef __TCLINTERPRETER_H +#include "TCLInterpreter.h" +#endif + //Required for base classes #ifndef __EXCEPTION_H #include "Exception.h" @@ -317,6 +322,7 @@ #include <histotypes.h> #endif + class CTCLException : public CTCLInterpreterObject ,public CException { @@ -338,7 +344,7 @@ CException(pString), m_nReason(am_nReason) { - m_ResultText = STD(string)(GetResult()); + m_ResultText = Tcl_GetStringResult(getInterpreter()->getInterpreter()); } CTCLException(CTCLInterpreter& am_rInterpreter, Int_t am_nReason, @@ -347,7 +353,8 @@ CException(rString), m_nReason(am_nReason) { - m_ResultText = STD(string)(GetResult()); + m_ResultText = Tcl_GetStringResult(getInterpreter()->getInterpreter()); + } virtual ~CTCLException ( ) { } //Destructor Modified: trunk/SpecTcl/TCL/TCLInterpreter.cpp =================================================================== --- trunk/SpecTcl/TCL/TCLInterpreter.cpp 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/TCL/TCLInterpreter.cpp 2012-06-15 20:41:14 UTC (rev 2033) @@ -93,9 +93,10 @@ int Status = Tcl_EvalFile(m_pInterpreter, (char*)pFilename); if(Status != TCL_OK) { + throw CTCLException(*this, Status, - "CTCLInterpreter::EvalFile - Evaluating file script");; + "CTCLInterpreter::EvalFile - Evaluating file script: "); } return std::string(Tcl_GetStringResult(m_pInterpreter)); } Modified: trunk/SpecTcl/ccusb/SpecTclRC.tcl =================================================================== --- trunk/SpecTcl/ccusb/SpecTclRC.tcl 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/ccusb/SpecTclRC.tcl 2012-06-15 20:41:14 UTC (rev 2033) @@ -62,17 +62,7 @@ puts "Done." } -splash::progress $splash {Loading SpecTcl Tree Gui} 1 -puts -nonewline "Starting treeparamgui..." -source $SpecTclHome/Script/SpecTclGui.tcl -puts " Done" - - -splash::progress $splash {SpecTcl ready for use} 1 - -splash::config $splash -delay 2000 - # # Figure out where the packages are and requrie the ccusbconfig # package to get the configuration done: @@ -82,5 +72,15 @@ configureSpecTcl sbind -all +puts "Configured" -#.gui.b update +splash::progress $splash {Loading SpecTcl Tree Gui} 1 + +puts -nonewline "Starting treeparamgui..." +source $SpecTclHome/Script/SpecTclGui.tcl +puts " Done" + + +splash::progress $splash {SpecTcl ready for use} 1 + +splash::config $splash -delay 2000 Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/configure.ac 2012-06-15 20:41:14 UTC (rev 2033) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-009) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-010) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT Modified: trunk/SpecTcl/gri-2.12.20/Makefile.in =================================================================== --- trunk/SpecTcl/gri-2.12.20/Makefile.in 2012-06-15 20:37:31 UTC (rev 2032) +++ trunk/SpecTcl/gri-2.12.20/Makefile.in 2012-06-15 20:41:14 UTC (rev 2033) @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +15,9 @@ @SET_MAKE@ pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -43,6 +45,7 @@ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -54,15 +57,43 @@ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -111,6 +142,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PROGS = @PROGS@ @@ -169,6 +201,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = src doc debian @@ -185,15 +218,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -209,9 +242,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -220,7 +254,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fa... [truncated message content] |
From: <ro...@us...> - 2012-07-02 19:53:26
|
Revision: 2036 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=2036&view=rev Author: ron-fox Date: 2012-07-02 19:53:19 +0000 (Mon, 02 Jul 2012) Log Message: ----------- Issue # 1191 - save spectrum channel data type Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Gui/guistate.tcl trunk/SpecTcl/configure.ac Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-06-15 21:12:18 UTC (rev 2035) +++ trunk/SpecTcl/CHANGELOG 2012-07-02 19:53:19 UTC (rev 2036) @@ -981,3 +981,5 @@ * Allow user to specify ring name. - June 15, 2012 Issue #1063 Improve new gui startup time. +3.3-011 - July 2, 2012 Issue # 1191 Save spectrum channel type (byte word longword e.g.) + when doing a save of failsafe write. Modified: trunk/SpecTcl/Gui/guistate.tcl =================================================================== --- trunk/SpecTcl/Gui/guistate.tcl 2012-06-15 21:12:18 UTC (rev 2035) +++ trunk/SpecTcl/Gui/guistate.tcl 2012-07-02 19:53:19 UTC (rev 2036) @@ -481,11 +481,12 @@ set type [lindex $spectrum 2] set parameters [lindex $spectrum 3] set axes [lindex $spectrum 4] - + set datatype [lindex $spectrum 5] + if {$::guistate::writeDeletes} { puts $fd "catch {spectrum -delete [list $name]}" } - puts $fd "spectrum [list $name] $type [list $parameters] [list $axes]" + puts $fd "spectrum [list $name] $type [list $parameters] [list $axes] $datatype" } } Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2012-06-15 21:12:18 UTC (rev 2035) +++ trunk/SpecTcl/configure.ac 2012-07-02 19:53:19 UTC (rev 2036) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-010) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-011) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-07-09 13:03:17
|
Revision: 2038 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=2038&view=rev Author: ron-fox Date: 2012-07-09 13:02:48 +0000 (Mon, 09 Jul 2012) Log Message: ----------- * Bug #1151: Builds of ccusbSpecTcl on precise pangolin fail with undefined references * Bug #1152: ccusb build does not create docs directory * Bug #1153: issue 1151, 1150, 1152 apply to vmusb spectcl too. * Bug #1191: New GUI Spectrum save does not save spectrum channel data type. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Gui/datasource.tcl trunk/SpecTcl/ccusb/Makefile.am trunk/SpecTcl/vmusb/Makefile.am Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-07-02 20:11:01 UTC (rev 2037) +++ trunk/SpecTcl/CHANGELOG 2012-07-09 13:02:48 UTC (rev 2038) @@ -983,3 +983,5 @@ - June 15, 2012 Issue #1063 Improve new gui startup time. 3.3-011 - July 2, 2012 Issue # 1191 Save spectrum channel type (byte word longword e.g.) when doing a save of failsafe write. + - July 9, 2012 Issue #1152, Issue #1150, Issue #1151, Issue #1153 - Get clean builds + on Ubuntu Precise Pangolin.. \ No newline at end of file Modified: trunk/SpecTcl/Gui/datasource.tcl =================================================================== --- trunk/SpecTcl/Gui/datasource.tcl 2012-07-02 20:11:01 UTC (rev 2037) +++ trunk/SpecTcl/Gui/datasource.tcl 2012-07-09 13:02:48 UTC (rev 2038) @@ -359,7 +359,7 @@ after 1 [list $win.$initialFormat select]; # Not sure why this must be scheduled(?) } destructor { - error "Destroying formatchooser" + } # Modified: trunk/SpecTcl/ccusb/Makefile.am =================================================================== --- trunk/SpecTcl/ccusb/Makefile.am 2012-07-02 20:11:01 UTC (rev 2037) +++ trunk/SpecTcl/ccusb/Makefile.am 2012-07-09 13:02:48 UTC (rev 2038) @@ -25,9 +25,10 @@ -I@top_srcdir@/Analysis \ -I@top_srcdir@/Display -I@top_srcdir@/Tape -I@top_srcdir@/Filter \ -I@top_srcdir@/TreeParam \ - @TCL_FLAGS@ -DINSTALLED_IN='"$(prefix)"' @XINCLUDES@ + @TCL_FLAGS@ -DINSTALLED_IN='"@prefix@"' @XINCLUDES@ -CCUSBSpecTcl_LDFLAGS = ../Events/libAnalysis.la \ +CCUSBSpecTcl_LDFLAGS = ../SpecTcl/libTclGrammerCommands.la \ + ../Events/libAnalysis.la \ ../Fits/libFits.la \ ../TCL/libtclPlus.la \ ../Analysis/libBufferAnalysis.la \ @@ -41,14 +42,13 @@ ../Filter/libFilter.la \ ../SpectrumIO/libSpecio.la \ ../TreeParam/libTreeParam.la \ - ../SpecTcl/libTclGrammerCommands.la \ ../DecoderRing/libDecoderRing.la \ ../NSCLException/libException.la \ ../Display/libXamine.la \ - -lXt -lX11 $(X11EXTRA_LDFLAGS) $(LD_EXTRA_FLAGS) \ + -lXt -lX11 @X11EXTRA_LDFLAGS@ @LD_EXTRA_FLAGS@ \ -lgsl -lgslcblas \ @TCL_LDFLAGS@ @XLIBSW@ -L@top_srcdir@/SpectrumIO \ - -g -Wl,"-rpath=($prefix)/lib" + -g -Wl,"-rpath=@libdir@" # @@ -58,7 +58,7 @@ # other scripts where they can be found in TclLibs. # install-exec-local: docs_built - $(mkinstalldirs) @prefix@/CCUSBSkel + $(mkinstalldirs) @prefix@/CCUSBSkel @prefis@/share/ccusb $(INSTALL_DATA) *.cpp @prefix@/CCUSBSkel $(INSTALL_DATA) *.h @prefix@/CCUSBSkel $(INSTALL_DATA) SpecTclRC.tcl @prefix@/CCUSBSkel @@ -82,9 +82,9 @@ SpecTclRC.tcl ccusbSpecTcl.xml docs_built: ccusbSpecTcl.xml - -$(MANDOCBOOK) man $< 2>/dev/null - $(HTMLDOCBOOK) $< - $(HCDOCBOOK) $< + -@MANDOCBOOK@ man $< 2>/dev/null + @HTMLDOCBOOK@ $< + @HCDOCBOOK@ $< dvipdf ccusbSpecTcl.dvi touch docs_built Modified: trunk/SpecTcl/vmusb/Makefile.am =================================================================== --- trunk/SpecTcl/vmusb/Makefile.am 2012-07-02 20:11:01 UTC (rev 2037) +++ trunk/SpecTcl/vmusb/Makefile.am 2012-07-09 13:02:48 UTC (rev 2038) @@ -55,7 +55,7 @@ -I@top_srcdir@/Display -I@top_srcdir@/Tape -I@top_srcdir@/Filter \ -I@top_srcdir@/TreeParam \ -I@top_srcdir@/Fits -I@top_srcdir@/factories \ - @TCL_FLAGS@ -DINSTALLED_IN='"$(prefix)"' @XINCLUDES@ + @TCL_FLAGS@ -DINSTALLED_IN='"@prefix@"' @XINCLUDES@ VMUSBSpecTcl_LDFLAGS = ../Events/libAnalysis.la \ ../Fits/libFits.la \ @@ -75,19 +75,19 @@ ../DecoderRing/libDecoderRing.la \ ../NSCLException/libException.la \ ../Display/libXamine.la \ - -lXt -lX11 $(X11EXTRA_LDFLAGS) $(LD_EXTRA_FLAGS) \ + -lXt -lX11 @X11EXTRA_LDFLAGS@ @LD_EXTRA_FLAGS@ \ -lgsl -lgslcblas \ @TCL_LDFLAGS@ @XLIBSW@ -L@top_srcdir@/SpectrumIO \ - -g -Wl,"-rpath=($prefix)/lib" + -g -Wl,"-rpath=@libdir@" install-exec-local: docs_built - $(mkinstalldirs) @prefix@/VMUSBSkel + $(mkinstalldirs) @prefix@/VMUSBSkel @prefix@/share/vmusb $(INSTALL_DATA) *.cpp *.h @prefix@/VMUSBSkel $(INSTALL_DATA) MakefileSkel @prefix@/VMUSBSkel/Makefile $(mkinstalldirs) @prefix@/TclLibs/vmusb $(INSTALL_DATA) spectclSetup.tcl configFile.tcl constants.tcl @prefix@/TclLibs/vmusb - echo pkg_mkIndex -verbose @prefix@/TclLibs/vmusb "*.tcl" | $(TCLSH_CMD) + echo pkg_mkIndex -verbose @prefix@/TclLibs/vmusb "*.tcl" | @TCLSH_CMD@ $(mkinstalldirs) @prefix@/share/vmusb $(INSTALL_DATA) *.html @prefix@/share/vmusb $(INSTALL_DATA) *.pdf @prefix@/share/vmusb @@ -104,9 +104,9 @@ docs_built: vmusb.xml - -$(MANDOCBOOK) man $< 2>/dev/null - $(HTMLDOCBOOK) $< - $(HCDOCBOOK) $< + -@MANDOCBOOK@ man $< 2>/dev/null + @HTMLDOCBOOK@ $< + @HCDOCBOOK@ $< dvipdf vmusb.dvi touch docs_built This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-07-24 20:16:17
|
Revision: 2042 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=2042&view=rev Author: ron-fox Date: 2012-07-24 20:16:11 +0000 (Tue, 24 Jul 2012) Log Message: ----------- time_t -> uint32_t in ring items to make them 64 bit clean. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/DecoderRing/DataFormat.h Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-07-21 21:45:35 UTC (rev 2041) +++ trunk/SpecTcl/CHANGELOG 2012-07-24 20:16:11 UTC (rev 2042) @@ -984,4 +984,5 @@ 3.3-011 - July 2, 2012 Issue # 1191 Save spectrum channel type (byte word longword e.g.) when doing a save of failsafe write. - July 9, 2012 Issue #1152, Issue #1150, Issue #1151, Issue #1153 - Get clean builds - on Ubuntu Precise Pangolin.. \ No newline at end of file + on Ubuntu Precise Pangolin.. + - July 24, 2012 - Use 64bit clean DataFormat.h (time_t -> uint32_t). Modified: trunk/SpecTcl/DecoderRing/DataFormat.h =================================================================== --- trunk/SpecTcl/DecoderRing/DataFormat.h 2012-07-21 21:45:35 UTC (rev 2041) +++ trunk/SpecTcl/DecoderRing/DataFormat.h 2012-07-24 20:16:11 UTC (rev 2042) @@ -122,7 +122,7 @@ RingItemHeader s_header; uint32_t s_runNumber; uint32_t s_timeOffset; - time_t s_Timestamp; + uint32_t s_Timestamp; char s_title[TITLE_MAXSIZE+1]; } StateChangeItem, *pStateChangeItem; @@ -134,7 +134,7 @@ RingItemHeader s_header; uint32_t s_intervalStartOffset; uint32_t s_intervalEndOffset; - time_t s_timestamp; + uint32_t s_timestamp; uint32_t s_scalerCount; uint32_t s_scalers[1]; } ScalerItem, *pScalerItem; @@ -147,7 +147,7 @@ typedef struct _TextItem { RingItemHeader s_header; uint32_t s_timeOffset; - time_t s_timestamp; + uint32_t s_timestamp; uint32_t s_stringCount; char s_strings[1]; } TextItem, *pTextItem; @@ -169,7 +169,7 @@ typedef struct __PhysicsEventCountItem { RingItemHeader s_header; uint32_t s_timeOffset; - time_t s_timestamp; + uint32_t s_timestamp; uint64_t s_eventCount; /* Maybe 4Gevents is too small ;-) */ } PhysicsEventCountItem, *pPhysicsEventCountItem; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-09-19 18:39:53
|
Revision: 2048 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=2048&view=rev Author: ron-fox Date: 2012-09-19 18:39:46 +0000 (Wed, 19 Sep 2012) Log Message: ----------- Start edit level 3.3-012 Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/configure.ac Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-08-30 11:53:12 UTC (rev 2047) +++ trunk/SpecTcl/CHANGELOG 2012-09-19 18:39:46 UTC (rev 2048) @@ -986,3 +986,4 @@ - July 9, 2012 Issue #1152, Issue #1150, Issue #1151, Issue #1153 - Get clean builds on Ubuntu Precise Pangolin.. - July 24, 2012 - Use 64bit clean DataFormat.h (time_t -> uint32_t). +3.3-012 Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2012-08-30 11:53:12 UTC (rev 2047) +++ trunk/SpecTcl/configure.ac 2012-09-19 18:39:46 UTC (rev 2048) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-011) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-012) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-09-19 20:40:40
|
Revision: 2049 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=2049&view=rev Author: ron-fox Date: 2012-09-19 20:40:34 +0000 (Wed, 19 Sep 2012) Log Message: ----------- Issue #1322 - Identify product in VERSION file. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Makefile.am Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-09-19 18:39:46 UTC (rev 2048) +++ trunk/SpecTcl/CHANGELOG 2012-09-19 20:40:34 UTC (rev 2049) @@ -987,3 +987,4 @@ on Ubuntu Precise Pangolin.. - July 24, 2012 - Use 64bit clean DataFormat.h (time_t -> uint32_t). 3.3-012 + - Issue #1322 - Add product name to VERSION file e.g. SpecTcl- Modified: trunk/SpecTcl/Makefile.am =================================================================== --- trunk/SpecTcl/Makefile.am 2012-09-19 18:39:46 UTC (rev 2048) +++ trunk/SpecTcl/Makefile.am 2012-09-19 20:40:34 UTC (rev 2049) @@ -62,7 +62,7 @@ echo CCLD=$(CC) >> CompilationRules.temp cat CompilationRules.include >> CompilationRules.temp $(INSTALL_DATA) CompilationRules.temp $(sysconfdir)/CompilationRules.include - echo "Version: " $(VERSION) build on `hostname` `date` >VERSION + echo "Version: " SpecTcl-$(VERSION) build on `hostname` `date` >VERSION $(INSTALL_DATA) VERSION $(prefix)/VERSION $(INSTALL_DATA) CHANGELOG $(prefix) $(MANDB) $(prefix)/man \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2012-12-31 21:56:47
|
Revision: 2064 http://sourceforge.net/p/nsclspectcl/code/2064 Author: ron-fox Date: 2012-12-31 21:56:45 +0000 (Mon, 31 Dec 2012) Log Message: ----------- After clean build after 3.3-013 merge Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Display/Makefile.am trunk/SpecTcl/Display/client.c trunk/SpecTcl/Display/specchoose.cc trunk/SpecTcl/Display/xamineDataTypes.h trunk/SpecTcl/Gui/Makefile.am trunk/SpecTcl/Gui/pkgIndex.tcl trunk/SpecTcl/configure.ac trunk/SpecTcl/treegui/treemenuWidget.tcl Added Paths: ----------- trunk/SpecTcl/Gui/browser.tcl.old trunk/SpecTcl/Gui/folder.png trunk/SpecTcl/Gui/ttkbrowser.tcl trunk/SpecTcl/m4/ Removed Paths: ------------- trunk/SpecTcl/Gui/browser.tcl trunk/SpecTcl/gri-2.12.20/ Property Changed: ---------------- trunk/SpecTcl/ Index: trunk/SpecTcl =================================================================== --- trunk/SpecTcl 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl 2012-12-31 21:56:45 UTC (rev 2064) Property changes on: trunk/SpecTcl ___________________________________________________________________ Modified: svn:mergeinfo ## -2,3 +2,5 ## /branches/3.3-008-dev:1987-1996 /branches/3.3-009-development:2000-2014 /branches/SpecTcl-3.3-010-development:2016-2031 +/branches/SpecTcl-3.3-013:2051-2061 +/tags/SpecTcl-3.3-013-premerge:2062-2063 \ No newline at end of property Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl/CHANGELOG 2012-12-31 21:56:45 UTC (rev 2064) @@ -988,3 +988,4 @@ - July 24, 2012 - Use 64bit clean DataFormat.h (time_t -> uint32_t). 3.3-012 - Issue #1322 - Add product name to VERSION file e.g. SpecTcl- +3.3-013 Modified: trunk/SpecTcl/Display/Makefile.am =================================================================== --- trunk/SpecTcl/Display/Makefile.am 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl/Display/Makefile.am 2012-12-31 21:56:45 UTC (rev 2064) @@ -1,7 +1,7 @@ bin_PROGRAMS = Xamine colorset HOMEDEF = -DHOME='"$(prefix)"' -GRIFLAGS = -DGRI_DIR='"@gri_dir@"' -DGRI_CMD_DIR='"@gri_cmd_dir@"' +GRIFLAGS = -DGRI_DIR='"@gri_dir@"' -DGRI_CMD_DIR='"@gri_dir@"' LEXOUT = lex.yy.c MOTIF_SOURCES = XMCallback.cc XMMenus.cc XMDialogs.cc XMWidget.cc \ XMPushbutton.cc XMManagers.cc XMText.cc Modified: trunk/SpecTcl/Display/client.c =================================================================== --- trunk/SpecTcl/Display/client.c 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl/Display/client.c 2012-12-31 21:56:45 UTC (rev 2064) @@ -349,11 +349,11 @@ { Xamine_shared *pShape = 0; printf("(client) offsets into shared mem: \n"); - printf(" dsp_xy = %x\n", pShape->dsp_xy); - printf(" dsp_titles = %x\n", pShape->dsp_titles); - printf(" dsp_types = %x\n", pShape->dsp_types); - printf(" dsp_map = %x\n", pShape->dsp_map); - printf(" dsp_spectra = %x\n", &(pShape->dsp_spectra)); + printf(" dsp_xy = %lx\n", (unsigned long)pShape->dsp_xy); + printf(" dsp_titles = %lx\n", (unsigned long)pShape->dsp_titles); + printf(" dsp_types = %lx\n", (unsigned long)pShape->dsp_types); + printf(" dsp_map = %lx\n", (unsigned long)pShape->dsp_map); + printf(" dsp_spectra = %lx\n", (unsigned long)&(pShape->dsp_spectra)); printf(" Total size = %d\n", sizeof(Xamine_shared)); } Modified: trunk/SpecTcl/Display/specchoose.cc =================================================================== --- trunk/SpecTcl/Display/specchoose.cc 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl/Display/specchoose.cc 2012-12-31 21:56:45 UTC (rev 2064) @@ -514,7 +514,7 @@ void Callback_handler(XMWidget *w, XtPointer userd, XtPointer calld) { XMSelectionDialog *choice = (XMSelectionDialog *)w; - void (*usercallback)(int id) = (void (*)(int))userd; + void (*usercallback)(int id) = reinterpret_cast<void (*)(int)>(reinterpret_cast<size_t>(userd)); XmSelectionBoxCallbackStruct *info = (XmSelectionBoxCallbackStruct *)calld; char error_msg[512]; @@ -671,12 +671,12 @@ } typedef void (*cbfunc)(XMWidget *, XtPointer, XtPointer); ok = SpectrumChooser->AddDoCallback(Callback_handler, - (XtPointer)callback_data->displayfunc, + reinterpret_cast<XtPointer>(reinterpret_cast<size_t>(callback_data->displayfunc)), &apply); /* New Ok/Apply */ cancel = SpectrumChooser->AddCancelCallback(Callback_handler, - (XtPointer)callback_data->displayfunc); /* New cancel */ + reinterpret_cast<XtPointer>(reinterpret_cast<size_t>(callback_data->displayfunc))); /* New cancel */ nomatch = SpectrumChooser->AddNoMatchCallback(Callback_handler, - (XtPointer)callback_data->displayfunc); + reinterpret_cast<XtPointer>(reinterpret_cast<size_t>(callback_data->displayfunc))); /* Show the dialog to the world. */ Modified: trunk/SpecTcl/Display/xamineDataTypes.h =================================================================== --- trunk/SpecTcl/Display/xamineDataTypes.h 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl/Display/xamineDataTypes.h 2012-12-31 21:56:45 UTC (rev 2064) @@ -60,6 +60,13 @@ #endif #endif +#ifndef __CRT_STDINT_H +#include <stdint.h> +#ifndef __CRT_STDINT_H +#define __CRT_STDINT_H +#endif +#endif + #ifndef PAGESIZE /* Still didn't find a pagesize... */ #define PAGESIZE 8192 #endif @@ -82,9 +89,9 @@ /* #pragma pack(1) */ typedef union { - unsigned char XAMINE_b[XAMINE_SPECBYTES]; - unsigned short XAMINE_w[XAMINE_WORDS]; - unsigned int XAMINE_l[XAMINE_LONGS]; + uint8_t XAMINE_b[XAMINE_SPECBYTES]; + uint16_t XAMINE_w[XAMINE_WORDS]; + uint32_t XAMINE_l[XAMINE_LONGS]; } spec_spectra; /* Spectrum storage type. */ Modified: trunk/SpecTcl/Gui/Makefile.am =================================================================== --- trunk/SpecTcl/Gui/Makefile.am 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl/Gui/Makefile.am 2012-12-31 21:56:45 UTC (rev 2064) @@ -7,8 +7,8 @@ $(INSTALL_PROGRAM) $(srcdir)/*.tcl $(SCRIPTDEST) $(INSTALL_DATA) $(srcdir)/*.html $(HELPDEST) $(INSTALL_DATA) $(srcdir)/*.gif $(ICONDEST) + $(INSTALL_DATA) $(srcdir)/*.png $(ICONDEST) - EXTRA_DIST = 2dGate.html \ folderGui.tcl \ Browser.html \ @@ -27,7 +27,7 @@ applygate.tcl \ attachPipe.html \ axisicon.gif \ -browser.tcl \ +ttkbrowser.tcl \ c2band.tcl \ compoundGate.html \ compoundgate.tcl \ @@ -94,4 +94,5 @@ editGammaDeluxe.tcl \ editGammaDeluxehelp.html \ editgsummary.tcl \ -gammasummary.html +gammasummary.html \ +folder.png Deleted: trunk/SpecTcl/Gui/browser.tcl =================================================================== --- trunk/SpecTcl/Gui/browser.tcl 2012-12-31 21:32:28 UTC (rev 2063) +++ trunk/SpecTcl/Gui/browser.tcl 2012-12-31 21:56:45 UTC (rev 2064) @@ -1,1251 +0,0 @@ - -# This software is Copyright by the Board of Trustees of Michigan -# State University (c) Copyright 2005. -# -# You may use this software under the terms of the GNU public license -# (GPL). The terms of this license are described at: -# -# http://www.gnu.org/licenses/gpl.txt -# -# Author: -# Ron Fox -# NSCL -# Michigan State University -# East Lansing, MI 48824-1321 -# - -package provide browser 1.0 -package require BLT -package require snit - - -# browser provides a snit megawidget called "browser" which allows -# the user to browse SpecTcl objects in a hierarchical manner -# currently implemented as a blt treeview with a scrollbar. The object types that can -# be browsed include: -# Spectra -# Parameters (tree and otherwise) -# TreeVariables -# Gates -# -# Options: -# -# The following allow the attachment -# of scripts to the right click of top level folders. -# -# -spectrumfoldercommand script -# -parameterfoldercommand script -# -variablefoldercommand script -# -gatefoldercommand script -# -# The following allow the attachment of scripts -# to double-clicks of spectra, parameters, variablesand gates: -# -# -spectrumscript script -# -parameterscript script -# -variablescript script -# -gatescript script -# -# The following allow the attachment of scripts to right clicks -# of spectra, parameters, variables and gates: -# -# -spectrumrightclick script -# -parameterrightclick script -# -variablerightclick script -# -gaterightclick script -# -# The following control what is visible in the browser: -# -# -restrict {list of toplevel folders to view} (at present this is not dynamic!!). -# -detail bool -# -showcolumns {list of columns to show} (at presnt this is not dynamic!!). -# -filtergates script Run gate defs through script and only display those for which script is true -# -filterparameters script As for -filtergates but with parameters. -# -filterspectra script as for -filtergates but with specrtra. -#\ -# Geometric aspects: -# -width - Width of the browser window (at present not dynamic) -# -treewidth - Width of the tree column of the browser. (at present not dynamic) -# -# Each of these categories is represented as a folder whose contents contain the -# objects of that type. By convention in SpecTcl/Treeparameter, .'s are path -# separators. The tree hierarchy will generate, as needed, subfolders to reflect -# the pathing hierarchy generated by the user. -# - -# Locate ourself and read in the icons we require: -# - -namespace eval browser { - variable here [file dirname [info script]] -} - -image create photo ::browser::spectrumicon -format gif \ - -file [file join $::browser::here icons spectrumicon.gif] -image create photo ::browser::gateicon -format gif \ - -file [file join $::browser::here icons gateicon.gif] -image create photo ::browser::paramicon -format gif \ - -file [file join $::browser::here icons treeparicon.gif] -image create photo ::browser::varicon -format gif \ - -file [file join $::browser::here icons treevaricon.gif] -image create photo ::browser::axisicon -format gif \ - -file [file join $::browser::here icons axisicon.gif] -image create photo ::browser::pointicon -format gif \ - -file [file join $::browser::here icons pointicon.gif] -image create photo ::browser::pseudoicon -format gif \ - -file [file join $::browser::here icons pseudoicon.gif] - - - -::snit::widget browser { - option -spectrumfoldercommand {} - option -parameterfoldercommand {} - option -variablefoldercommand {} - option -gatefoldercommand {} - - - option -spectrumscript {} - option -parameterscript {} - option -variablescript {} - option -gatescript {} - - - option -spectrumrightclick {} - option -parameterrightclick {} - option -variablerightclick {} - option -gaterightclick {} - - option -restrict {spectra parameters gates variables} - option -detail 1 - option -showcolumns {type gate low high bins value units} - option -filtergates {} - option -filterparameters {} - option -filterspectra {} - - option -width 8in - option -treewidth 2.5in - - delegate option * to tree - delegate method * to tree - - constructor {args} { - $self configurelist $args - - - # Create the tree and the initial top level folders: - - - - install tree using ::blt::treeview $win.tree - $win.tree configure -autocreate 1 -hideroot 1 -separator . -width $options(-width)tree - $win.tree sort auto 1 - - if {[lsearch -exact $options(-restrict) spectra] != -1} { - set folderid [$win.tree insert end Spectra] - $win.tree entry configure $folderid -bindtags [list Spectra all] - $win.tree bind Spectra <Button-3> \ - [mymethod FolderContextDispatch -spectrumfoldercommand %X %Y] - } - - if {[lsearch -exact $options(-restrict) parameters] != -1} { - set folderid [$win.tree insert end Parameters] - $win.tree entry configure $folderid -bindtags [list Parameters all] - $win.tree bind Parameters <Button-3> \ - [mymethod FolderContextDispatch -parameterfoldercommand %X %Y] - } - - if {[lsearch -exact $options(-restrict) gates] != -1} { - set folderid [$win.tree insert end Gates] - $win.tree entry configure $folderid -bindtags [list Gates all] - $win.tree bind Gates <Button-3> \ - [mymethod FolderContextDispatch -gatefoldercommand %X %Y] - } - if {[lsearch -exact $options(-restrict) variables] != -1} { - set folderid [$win.tree insert end Variables] - $win.tree entry configure $folderid -bindtags [list Variables all] - $win.tree bind Variables <Button-3> \ - [mymethod FolderContextDispatch -variablefoldercommand %X %Y] - } - scrollbar $win.scroll -orient vertical -command "$win.tree yview" - $win.tree configure -yscrollcommand "$win.scroll set" - - scrollbar $win.scrollx -orient horizontal -command "$win.tree xview" - $win.tree configure -xscrollcommand "$win.scrollx set" - - - # Layout the tree and its scrollbar (packer is still best for this simple stuff). - - grid $win.tree $win.scroll -sticky news - grid $win.scrollx -sticky news - grid rowconfigure $win 0 -weight 1 - grid columnconfigure $win 0 -weight 1 - - - # Add the data columns... in hopefully a reasonable order. - # - - $win.tree column insert end Type -edit 0 -borderwidth 3 -relief ridge - if {[lsearch -exact $options(-showcolumns) type] == -1} { - $win.tree column configure Type -hide 1 - } - $win.tree column insert end Gate -edit 0 -borderwidth 3 -relief ridge - if {[lsearch -exact $options(-showcolumns) gate] == -1} { - $win.tree column configure Gate -hide 1 - } - $win.tree column insert end Low -edit 0 -borderwidth 3 -relief ridge - if {[lsearch -exact $options(-showcolumns) low] == -1} { - $win.tree column configure Low -hide 1 - } - $win.tree column insert end High -edit 0 -borderwidth 3 -relief ridge - if {[lsearch -exact $options(-showcolumns) high] == -1} { - $win.tree column configure High -hide 1 - } - $win.tree column insert end Bins -edit 0 -borderwidth 3 -relief ridge - if {[lsearch -exact $options(-showcolumns) bins] == -1} { - $win.tree column configure Bins -hide 1 - } - $win.tree column insert end Value -edit 0 -borderwidth 3 -relief ridge - if {[lsearch -exact $options(-showcolumns) value] == -1} { - $win.tree column configure Value -hide 1 - } - $win.tree column insert end Units -edit 0 -borderwidth 3 -relief ridge - if {[lsearch -exact $options(-showcolumns) units] == -1} { - $win.tree column configure Units -hide 1 - } - - - # Set the tree column width: - - $win.tree column configure [lindex [$win.tree column names] 0] \ - -width $options(-treewidth) - - # Fill the subfolders (we're hog wild assuming this is SpecTcl - - set timing [time {$self fillAllFolders} 1] - - - - # Event bindings for elements: - - $win.tree bind gate <Button-1> +[mymethod selectElement %x %y] - $win.tree bind gate <Double-1> +[mymethod onElementDoubleClick -gatescript %x %y] - $win.tree bind gate <Button-3> +[mymethod onElementContext -gaterightclick %x %y %X %Y] - - $win.tree bind spectrum <Button-1> +[mymethod selectElement %x %y] - $win.tree bind spectrum <Double-1> +[mymethod onElementDoubleClick -spectrumscript %x %y] - $win.tree bind spectrum <Button-3> +[mymethod onElementContext -spectrumrightclick %x %y %X %Y] - - $win.tree bind parameter <Button-1> +[mymethod selectElement %x %y] - $win.tree bind parameter <Double-1> +[mymethod onElementDoubleClick -parameterscript %x %y] - $win.tree bind parameter <Button-3> +[mymethod onElementContext -parameterrightclick %x %y %X %Y] - - $win.tree bind variable <Button-1> +[mymethod selectElement %x %y] - $win.tree bind variable <Double-1> +[mymethod onElementDoubleClick -variablescript %x %y] - $win.tree bind variable <Button-3> +[mymethod onElementContext -variablerightclick %x %y %X %Y] - - - - } - # fillAllFolders - # Destructively restock all folders; - # - method fillAllFolders {} { - if {[lsearch -exact $options(-restrict) spectra] != -1} { - $self fillSpectrumFolder - } - if {[lsearch -exact $options(-restrict) parameters] != -1} { - $self fillParameterFolder - } - if {[lsearch -exact $options(-restrict) variables] != -1} { - $self fillVariableFolder - } - if {[lsearch -exact $options(-restrict) gates] != -1} { - $self fillGateFolder - } - } - - # fillSpectrumFolder - # Fills in the Spectrum folder with spectrum definitions. At the top level, - # We just fill in the name and type. Then we need to dispatch to type dependent - # methods to figure out how to fill in the rest of spectrum information. - # As with all the fill*Folder functions, the existing spectra are first removed from - # the folder. See insertSpectrum for information about how to add a single spectrum. - # - method fillSpectrumFolder {} { - catch {$win.tree delete spectrum} - foreach application [apply -list] { - set name [lindex $application 0] - set gate [lindex [lindex $application 1] 0] - set gating($name) $gate - } - foreach spectrum [spectrum -list] { - if {$options(-filterspectra) != ""} { - if {![eval $options(-filterspectra) [list $spectrum]]} { - continue - } - } - set name [lindex $spectrum 1] - set type [lindex $spectrum 2] - set parameters [lindex $spectrum 3] - set axes [lindex $spectrum 4] - set dtype [lindex $spectrum 5] - set gate $gating($name) - if {$gate == "-TRUE-"} { - set gate ""; # Not intersted in ungated. - } - set treename [nameToPath Spectra $name] - - set parentPath [split $treename .] - set parentPath [lrange $parentPath 0 end-1] - set parentPath [join $parentPath .] - if {[catch {set parentPaths($parentPath)}] } { - $self makeParents $treename - } - set id [$win.tree insert end $treename] - set treetype "$type $dtype" - $win.tree entry configure $id -icons {::browser::spectrumicon ::browser::spectrumicon} \ - -activeicons {::browser::spectrumicon ::browser::spectrumicon} \ - -data [list Type $treetype Gate $gate] - $win.tree tag add spectrum $id - $win.tree entry configure $id -bindtags [list spectrum all] - if {$options(-detail)} { - $self setSpectrumSubInfo $id $type $parameters $axes - } - } - } - # fillParameterFolder - # Fills the parameter folder with the set of parameters that are now defined. - # Previously existing parameters in the folder are first destroyed. - # this is suitable for a wholesale refresh of the gui.. it is not - # so useful for adding a single parameter. See the addParameter method for that. - # - method fillParameterFolder {} { - catch {$win.tree delete parameter} - set timing [time { - foreach parameter [parameter -list] { - if {$options(-filterparameters) != ""} { - if {![eval $options(-filterparameters) [list $parameter]]} { - continue - } - } - set rawname [lindex $parameter 0] - set name [nameToPath Parameters $rawname] - - set parentPath [split $name .] - set parentPath [lrange $parentPath 0 end-1] - set parentPath [join $parentPath .] - if {[array names parentPaths $parentPath)] eq "" } { - $self makeParents $name - } - - set id [$win.tree insert end $name] - $win.tree entry configure $id -icons {::browser::paramicon ::browser::paramicon} \ - -activeicons {::browser::paramicon ::browser::paramicon} - $win.tree tag add parameter $id - $win.tree entry configure $id -bindtags [list parameter all] - set info [treeparameter -list $rawname] - if {$info != ""} { - set info [lindex $info 0] - set bins [lindex $info 1] - set low [lindex $info 2] - set hi [lindex $info 3] - set units [lindex $info 5] - $win.tree entry configure $id -data [list Low $low High $hi Bins $bins Units $units] - } - if {$options(-detail)} { - set pseudoInfo [pseudo -list $rawname] - if {$pseudoInfo != ""} { - $win.tree entry configure $id -icons {::browser::pseudoicon ::browser::pseudoicon} \ - -activeicons {::browser::pseudoicon ::browser::pseudoicon} - set pseudoInfo [lindex $pseudoInfo 0] - set dependencies [lindex $pseudoInfo 1] - set pseudonum 0 - foreach dependentParam $dependencies { - $self addEntryParameter $id $pseudonum $dependentParam - incr pseudonum - } - } - } - }} 1] - - } - # fillVariableFolder - # Fills the variable folder with the set of treevariables that are now defined. - # note that only treevariables are put in the folder, not ordinary Tcl vars. - # as that could be a strain on the user. Prior to filling, the existing - # variables are wiped out. This function is best used to do a full refresh. - # - # - method fillVariableFolder {} { - catch {$win.tree delete variable} - set vars [treevariable -list] - set varCount [llength $vars] - set varNum 0 - foreach variable $vars { - incr varNum - set rawname [lindex $variable 0] - set value [lindex $variable 1] - set units [lindex $variable 2] - set name [nameToPath Variables $rawname] - - set parentPath [split $name .] - set parentPath [lrange $parentPath 0 end-1] - set parentPath [join $parentPath .] - if {[catch {set parentPaths($parentPath)}] } { - $self makeParents $name - } - - set id [$win.tree insert end $name] - $win.tree tag add variable $id - $win.tree entry configure $id -data [list Value $value Units $units] \ - -icons {::browser::varicon ::browser::varicon} \ - -activeicons {::browser::varicon ::browser::varicon} \ - -bindtags [list variable all] - if {($varNum % 100) == 0} { - } - - } - } - # fillGateFolder - # Fills the gate folder with the set of gates that are now defined. - # The type column is filled with the gate type and gate type specific - # subnodes are created for each gate. - # - method fillGateFolder {} { - catch {$win.tree delete gate} - foreach gate [gate -list] { - $self addGateByDescription $gate - } - - } - # update - # Updates the browser to catch any items that were recently added. - # - method update {} { - $self fillAllFolders; #Same thing really. - } - # getSelection - # Returns a list consisting of: - # The full names of all the selected entities in the browser tree. - # Note that the item type prefix (e.g. Gates or Spectrum) is still - # present. - # If there are no elements selected, an empty list is returned. - # Returns: - # A list of names in the selection. - # The elements of this list are translated back to names - # (the _BLTFOLDER is removed from intermediate path entries. - # - method getSelection {} { - set selected [$win.tree curselection]; # These are ID's. - set names [list] - foreach id $selected { - lappend names [pathToName [$win.tree get -full $id]] - } - return $names - } - # remove path - # Removes an entry from the browser tree given its name. - # note that if the path is not a terminal node all subordinate - # entries will also be deleted. - # Parameters: - # name - the name of the node. This will not have any folder decoration. - # - method remove name { - set path [nameToPath [getPrefix $name] $name] - set id [$win.tree find -full $path] - if {[llength $id] != 0} { - foreach i $id { - $win.tree delete $i - } - } - } - # find name - # Locate the id of a name in the browser tree. - # Parameters: - # name: - Name of the item to locate. This name will not have any - # folder decorations. - # - method find name { - set nameList [split $name .] - return [$win.tree find -full [nameToPath [getPrefix $name] $name]] - } - # addGate name - # Adds a gate to the browser tree. - # if -detail is true, then subnodes are built too. - # Parameters: - # name - Name of the gate (without the Gates. in front of it. - # - method addGate name { - set gate [gate -list $name] - if {$gate != ""} { - set gate [lindex $gate 0] - $self addGateByDescription $gate - } - } - # addGateByDescription - # Adds a gate to the browser tree given its description. - # Parameters: - # gate - the gate description - method addGateByDescription gate { - if {$options(-filtergates) != ""} { - if {![eval $options(-filtergates) [list $gate]]} { - return - } - } - set name [lindex $gate 0] - set type [lindex $gate 2] - set description [lindex $gate 3] - set entryname [nameToPath Gates $name] - - set parentPath [split $entryname .] - set parentPath [lrange $parentPath 0 end-1] - set parentPath [join $parentPath .] - if {[catch {set parentPaths($parentPath)}] } { - $self makeParents $entryname - } - - set id [$win.tree insert end $entryname] - $win.tree tag add gate $id - $win.tree entry configure $id -data [list Type $type] \ - -icons {::browser::gateicon ::browser::gateicon} \ - -activeicons {::browser::gateicon ::browser::gateicon} \ - -bindtags [list gate all] - - if {$options(-detail)} { - $self setGateSubInfo $id $type $description - } - - } - ########################################################################### - # - # Methods below this line should be considered private. - # - - # addPoint id number prefix point - # Adds a point subnode to the indicated id. - # A point subnode is labelled as "prefix (x,y)" - # A point is labelled with the pointicon. - # Parameters: - # id - Id of node to which this point is getting added. - # number - Index of the point - # prefix - Prefix string for the point label - # point - The point coordinates. - # - # - method addPoint {id number prefix point} { - set label [format "$prefix (%.2f,%.2f)" [lindex $point 0] [lindex $point 1]] - set pid [$win.tree insert -at $id end $number] - $win.tree entry configure $pid -label $label \ - -icons {::browser::pointicon ::browser::pointicon} \ - -activeicons {::browser::pointicon ::browser::pointicon} - } - # setSliceSubInfo id description - # Sets the subinfo for a slice gate. - # This consists of: - # - A parameter subnode containing the name of the parameter - # the gate is tested on. - # - A Point subnode labelled "limits : (low,hi) - # showing the extent of the gate on the parameter. - # - # parameters: - # id - The id in the treeview of the gate on which - # these subnodes will be created. - # description - The gate dependent description which is a list - # of the form {parameter-name {low high}} - method setSliceSubInfo {id description} { - # Parse the description: - - set parameter [lindex $description 0] - set limits [lindex $description 1] - $self addEntryParameter $id 0 $parameter - $self addPoint $id 1 "limits : " $limits - } - # set2DGateSubInfo id description - # Sets the appropriate subordinate information for a 2d gate - # (band or contour). - # - We create a parameter subentry for each of the parameters in the gate. - # These will be labelled X : parametername - # - We create a subfolder named 'points' and an entry in it for each - # point labelled (x,y). - # Parameters: - # id - The treeview id of the entity we are creating these subnodes under. - # description - The gate descrption which consists of an n element list. The - # First element is a 2 element sublist containing the x/y parameter names - # The subsequent elements are the x/y points as {x y} sublists. - # - method set2DGateSubInfo {id description} { - set parameters [lindex $description 0] - set points [lrange $description 1 end] - - $self addEntryParameter $id 0 "X : [lindex $parameters 0]" - $self addEntryParameter $id 1 "Y : [lindex $parameters 1]" - - set pno 0 - foreach point $points { - $self addPoint $id Points.$pno "" $point - incr pno - } - - } - # setCompoundGateSubinfo id description - # Sets appropriate subordinate information for compound gate. - # Compound gates consist of/depend on other gates. - # For each gate we produce a simple gate subentry - # simple gate subentries look like gates but don't show any subordinate - # detail other than the gate type. - # Parameters: - # id - The id of the gate we are creating subordinate information for. - # description - The gate description, which in this case is, - # the list of names of subordinate gates. - # - method setCompoundGateSubinfo {id description} { - foreach gate $description { - set gid [$win.tree insert -at $id end $gate] - set type [lindex [lindex [gate -list $gate] 0] 2] - $win.tree entry configure $gid -data [list Type $type] \ - -icons {::browser::gateicon ::browser::gateicon} \ - -activeicons {::browser::gateicon ::browser::gateicon} - } - } - # setGammaSliceSubinfo id description - # Sets the appropriate subordinate information for a gamma slice. - # This consists of a single point and a list of parameters and Parameters folder. - # The point is labelled "Limits : (hi,low)" - # Parameters: - # id - The treeview id of the gate to which we are adding - # the subordinates. - # description - The description of the gate. - # - method setGammaSliceSubinfo {id description} { - set point [lindex $description 0] - set parameters [lindex $description 1] - - set parno 0 - foreach parameter $parameters { - $self addEntryParameter $id Parameters.$parno $parameter - incr parno - } - $self addPoint $id $parno "Limits : " $point - - } - # setGamma2DGateSubinfo id description - # Set the appropriate subordinate information for a 2d gamma gate - # (gc, gb). This consists of a list of parameters in a parameter folder - # and a list of points in a Points folder. - # - # Parameters: - # id : Id of the gate we are filling in (in the treeview) - # description : Gate description which consists of a list of points and - # a list of parameters. - # - method setGamma2DGateSubinfo {id description} { - set points [lindex $description 0] - set parameters [lindex $description 1] - - set parno 0 - foreach parameter $parameters { - $self addEntryParameter $id Parameters.$parno $parameter - incr parno - } - - set pnum 0 - foreach point $points { - $self addPoint $id Points.$pnum "" $point - incr pnum - } - } - # setMaskGateSubinfo id description - # Sets appropriate subordinate informatino for a bitmask - # gate (type em, am, nm). We list the parameter - # and the mask. The mask is listed as a 'point' - # however the label is just mask = (hex of mask). - # Since the 'point' is not really a point, we must manually - # create the point. - # Parameters: - # id - Id of the gate for which we are making subordinate data. - # description - The gate description which consists of a parameter and mask. - # - method setMaskGateSubinfo {id description} { - set parameter [lindex $description 0] - set mask [lindex $description 1] - set masklabel [format "mask = 0x%x" $mask] - - $self addEntryParameter $id 0 $parameter - set mid [$win.tree insert -at $id end 1 ] - $win.tree entry configure $mid -label $masklabel \ - -icons {::browser::pointicon ::browser::pointicon} \ - -activeicons {::browser::pointicon ::browser::pointicon} - } - # - # setGateSubInfo id type description - # Sets appropriate subordinate information for a gate. - # This is done by independent gate type handlers that know - # the format of the gate description field (which varies from gate type to - # gate type). - # Parameters: - # id - treeview id of the gate we are elaborating. - # type - Gate type (from SpecTcl gate description. - # description - Gate dependent description information. - # - method setGateSubInfo {id gateType description} { - switch -exact -- $gateType { - s { - $self setSliceSubInfo $id $description - } - b - - c { - $self set2DGateSubInfo $id $description - } - * - - + - - "-" { - $self setCompoundGateSubinfo $id $description - } - gs { - $self setGammaSliceSubinfo $id $description - } - gb - - gc { - $self setGamma2DGateSubinfo $id $description - } - em - - am - - nm { - $self setMaskGateSubinfo $id $description - } - default { - } - } - } - # setFold id - # Adds a fold node to id if there is a fold applied to the - # spectrum. A fold is represented as a gate node labelled: - # "Folded on : gatename - # - method setFold id { - # The spectrum name is the part of the node name after Spectra. - - set name [$win.tree get -full $id] ; #Spectrum name. - set namelist [split $name .] - set namelist [lrange $namelist 1 end] - set name [join $namelist .] - - set fold [fold -list $name] - if {$fold != ""} { - set fold [lindex $fold 0] - set foldname "Folded on : [lindex $fold 1]" - set foldid [$win.tree insert -at $id end fold] - $win.tree entry configure $foldid -label $foldname \ - -icons {::browser::gateicon ::browser::gateicon} \ - -activeicons {::browser::gateicon ::browser::gateicon} - } - } - # addAxisInfo id specification parameter - # Adds axis specification information to the indicated node. - # this consists of low, high, bins, and if the parameter is - # a treeparam, units. - # Parameters: - # id - Id of the node to add this info to. - # specification - SpecTcl axis specification string. - # parameter - Parameter name. - # - method addAxisInfo {id specification parameter} { - set data [$win.tree entry cget $id -data]; # We append to existing data if any. - set low [format %.2f [lindex $specification 0]] - set high [format %.2f [lindex $specification 1]] - set bins [lindex $specification 2] - set units "" - set info [treeparameter -list $parameter] - if {$info != ""} { - set info [lindex $info 0] - set units [lindex $info 5] - } - lappend data Low $low High $high Bins $bins Units $units - $win.tree entry configure $id -data $data - } - # addAxis id name parameter specification - # Adds an axis subnode to the node id (presumably a spectrum). - # - The axis limits are taken from the specification - # - The label of the axis is "$name : parametername" - # - The units of the axis are taken from the treeparameter units - # if the parameter is a tree parameter. - # Parameters: - # id - ID of spectrum node to which the axis is being added. - # name - axis name (usually X or Y). - # parameter - Name of parameter from which to draw the parameter informatino. - # specification - Axis limit specification - # Returns: - # The new node id. - method addAxis {id name parameter specification} { - set axisid [$win.tree insert -at $id end $name] - $win.tree entry configure $axisid -label "$name : $parameter" \ - -icons {::browser::axisicon ::browser::axisicon} \ - -activeicons {::browser::axisicon ::browser::axisicon} - $self addAxisInfo $axisid $specification $parameter - return $axisid - } - # addEntryParameter id number name - # Adds a parameter subnode to a treeview entry The parameter node just shows the - # paramter name with a parameter icon. - # Parameters: - # id - Id of the treeview node to which this is being added. - # number - A parameter index number used to name the node. - # name - A parameter name used to label the node. - # Returns: - # The new node id. - # - method addEntryParameter {id number name} { - set pid [$win.tree insert -at $id end $number] - $win.tree entry configure $pid -label $name \ - -icons {::browser::paramicon ::browser::paramicon} \ - -activeicons {::browser::paramicon ::browser::paramicon} - return $pid - } - # set1dSubInfo id parameters axes - # Sets the subnode information for a 1-d spectrum: - # The info for the single axis is loaded into the - # the primary node's data. If the parameters is a - # treeparameter, units are also loaded. - # The parameter is loaded as a subnode, if a tree parameter its info - # is loaded as well. - # Parameters: - # id - The spectrum node's id in the treeview. - # parameters - A single parameter name. - # axes - A list containing a single axis definition list. - # - method set1dSubInfo {id parameters axes} { - set axis [lindex $axes 0] - $self addAxisInfo $id $axis $parameters - $self addEntryParameter $id 0 $parameters - - } - # set2dSubInfo id parameters axes - # Fils in the subnode information for a 2-d spectrum. - # This consists of two subnodes, one for the x axis and one for the y axis. - # The x axis is labelled with X : xparametername - # The y axis is labelled with Y : yparametername - # For both axes, the low, high, bins are taken from the axis definitions - # - method set2dSubInfo {id parameters axes} { - foreach parameter $parameters axis $axes name {X Y} { - $self addAxis $id $name $parameter $axis - } - } - # setg1SubInfo id parameters axes - # Fills in subnodes for a g1 spectrum: - # The axis information is placed on the spectrum line, and we create one - # parameter subnode for each parameter in the spectrum. The icon for each parameter - # is the treeparameter icon, to distinguish it from being an axis specification. - # No data is supplied with each parameter. There is no axis subnode. - # If the first parameter in the parameter list is a treeparamter, its units are - # used as the axis units. under the assumption that all paramters will have the same - # units. - # Parameters: - # id - The id of the parent node. - # parameters - List of parameters for the spectrum. - # axes - The single axis specification for the spectrum. - # - method setg1SubInfo {id parameters axes} { - - # Extract the axis information and add it to the existing data for id. - - set axis [lindex $axes 0] - $self addAxisInfo $id $axis [lindex $parameters 0] - - - $self setFold $id - - # Now a parameter subnode for each parameter in the gamma spectrum: - - set paramnumber 0 - foreach parameter $parameters { - $self addEntryParameter $id $paramnumber $parameter - incr paramnumber - } - - } - - # setg2SubInfo id parameters axes - # Fills in any required child nodes for a g2 spectrum. These - # consist of: - # - A fold subnode if the spectrum has a fold applied. - # - An x and a y axis subnode. The limits/bins on the axis are taken - # from the axis specification. If the first parameter in the spectrum - # is a tree parameter, the units for both axes are taken from it on the - # assumption that a gamma spectrum with mixed units has no reason to live. - # - A parameter axis for each parameter in the list. - # - method setg2SubInfo {id parameters axes} { - set axisid [$self addAxis $id X [lindex $parameters 0] [lindex $axes 0]] - $win.tree entry configure $axisid -label X - set axisid [$self addAxis $id Y [lindex $parameters 0] [lindex $axes 1]] - $win.tree entry configure $axisid -label Y - - $self setFold $id - - set paramno 0 - foreach param $parameters { - $self addEntryParameter $id $paramno $param - incr paramno - } - - } - # setSummarySubInfo id parameters axes - # Fills in any required child nodes for a summaryy spectrum. - # The summary spectrum has the following subnodes: - # - X axis which is labeled X : parameters - # for which the low is 0, the high is nparams -1 and the bins are nparams. - # and for which there are no units. - # - Y axis which is labelled Y and has info from the first of the parameters. - # - A parameter entry for each parameter in the spectrum - # The spectrum itself is given the y axis info. - # Parameters: - # id - Id of the node we are adding children to. - # parameters - List of parameter names involved in the spectra. - # axes - Axis specifications. - # - method setSummarySubInfo {id parameters axes} { - $self addAxis $id X parameters "0 [expr [llength $parameters]-1] [llength $parameters]" - set xid [$self addAxis $id Y [lindex $parameters 0] [lindex $axes 0]] - $win.tree entry configure $xid -label Y - $self addAxisInfo $id [lindex $axes 0] [lindex $parameters 0] - - set pno 0 - foreach parameter $parameters { - $self addEntryParameter $id $pno $parameter - incr pno - } - } - # setBitmaskSubInfo id parameters axes - # Fills in any required child nodes etc. for a bitmask spectrum. - # The top level gets the axis limit information, units are not relevant. - # A parameter subnode is created for the parameter from which the mask is being - # computed. - # Parameters: - # id - Id of the spectrum node we are filling in - # parameters - list of parameters that make the spectrum (one really) - # axes - list of axis specifications (one really). - # - method setBitmaskSubInfo {id parameters axes} { - set axis [lindex $axes 0] - $self addAxisInfo $id $axis $parameters - $self addEntryParameter $id 0 $parameters - } - # setStripchartSubInfo id parameters axes - # Fills in required child nodes for a stripchart spectrum from the time parameter - # This consists of an axis specification in the spectrum itself. - # and a pair of parameters with labels that look like: - # Time : parametername - # Value : parametername - # Parameters: - # id : The id of the spectrum node. - # parameters : The time and value parameter for the spectrum. - # axes : The single axis specification. - # - method setStripchartSubInfo {id parameters axes} { - set axis [lindex $axes 0] - set timep [lindex $parameters 0] - set valuep [lindex $parameters 1] - - $self addAxisInfo $id $axis $timep - $self addEntryParameter $id 0 "Time : $timep" - $self addEntryParameter $id 1 "Value : $valuep" - - } - - # set2dMultipleSubInfo id parameters axes - # Fills in the required sub info for a 2d multiply incremented - # spectrum. We add 2 axes named arbitrarily X and Y - # and list all the parameters and their information as well. - # - # Parameters: - # id : Id of the spectrum node. - # parameters : list of parameter names. - # axes : 2 axis specifications. - # - method set2dMultipleSubInfo {id parameters axes} { - set axisid [$self addAxis $id X "" [lindex $axes 0]] - $win.tree entry configure $axisid -label X - set axisid [$self addAxis $id Y "" [lindex $axes 1]] - $win.tree entry configure $axisid -label Y - - - set i 0 - foreach parameter $parameters { - $self addEntryParameter $id $i $parameter - incr i - } - } - # - # setgdSubInfo id parameters axes - # Set the sub information for a gamma 2d deluxe spectrum. - # Note that the parameters parameter is a 2 element list of - # the x and y parameters. - # - method setgdSubInfo {id parameters axes} { - set xparams [lindex $parameters 0] - set yparams [lindex $parameters 1] - - - set axisid [$self addAxis $id X "" [lindex $axes 0]] - $win.tree entry configure $axisid -label X - - set axisid [$self addAxis $id Y "" [lindex $axes 1]] - $win.tree entry configure $axisid -label Y - - set i 0 - - foreach x $xparams { - $self addEntryParameter $id $i "X: $x" - incr i - } - foreach y $yparams { - $self addEntryParameter $id $i "Y $y" - incr i - } - } - - # - # setGammaSummarySubInfo id parameters axes - # - # Set the sub information for a gamma summary spectrum. - # We'll have one axis, which is the Y axis, and that will - # display as on a 1-d spectrum. - # We'll have strip subfolders numbered for the x axis coordinate - # each strip subfolder will have entries for each parameter in that strip. - # - # - method setGammaSummarySubInfo {id parameters axes} { - - # Add the y axis as our axisi formation: - - set axis [lindex $axes 0] - set c [lindex $parameters 0] - - - set p [lindex $c 0] - - $self addAxisInfo $id $axis $p - - set xChannel 0 - set param 0 - foreach channel $parameters { - - # Add a folder for a channels parameters. - - set name Channel$xChannel - set channelId [$win.tree insert -at $id end $name] - $win.tree entry configure $channelId -label $name - - - foreach parameter $channel { - # Add a parameter definition. - - $self addEntryParameter $channelId $param $parameter - - incr param - } - incr xChannel - } - } - - # - # setSpectrumSubInfo id type parameters axes - # Fills in any required child nodes for a spectrum. This is type dependent. - # Note that in the case of 1-d spectra (type 1, g1, b, and S), - # We fill in the x axis low/high/bins on the parent node just to make - # it a bit easier for the user. - # For 2-d type spectra, we'll have subsidiary nodes for each axis that - # will have this information. - # In any case we list the parameters and their information as well. - # Parameters: - # id - The treeview ident of the primary node. - # spectrumType - The spectrum type. - # parameters - The parameters used by the spectrum. - # axes - The axis definitions used by the spectrum. - # - method setSpectrumSubInfo {id spectrumType parameters axes} { - - # Branch out depending on the type of spectrum: - - switch -exact -- $spectrumType { - 1 { - $self set1dSubInfo $id $parameters $axes - } - 2 { - $self set2dSubInfo $id $parameters $axes - } - g1 { - $self setg1SubInfo $id $parameters $axes - } - g2 { - $self setg2SubInfo $id $parameters $axes - } - gd { - $self setgdSubInfo $id $parameters $axes - } - s { - $self setSummarySubInfo $id $parameters $axes - } - b { - $self setBitmaskSubInfo $id $parameters $axes - } - S { - $self setStripchartSubInfo $id $parameters $axes - } - m2 { - $self set2dMultipleSubInfo $id $parameters $axes - } - gs { - $self setGammaSummarySubInfo $id $parameters $axes - } - default {} - } - } - # [mymethod FolderContextDispatch Option %X %Y] - # Dispactches folder context menu requests. These are typically - # requested via a right click over a top level folder. - # Parameters: - # Option - the name of the option array element that is holding - # the user supplied script to call or {} if there is none. - # the X/Y coordinates of the click are passed to the caller. - # %X %Y - The coordinates of the click relative to the widget. - # - method FolderContextDispatch {OptionName x y} { - set script $options($OptionName) - if {$script != ""} { - $script $x $y - } - } - # onElementDoubleClick Option x y - # Dispatches user scripts on double clicks on SpecTcl elements. - # (e.g. Spectra, Gates, Parameters, Variables. - # Parameters: - # Option - Name of the option that should have the user script body. - # x,y - Coordinates of the click. - # NOTE: - # The user script is called: - # userscript path - # Where path is the path of the nearest element under the pointer when the doubleclick occured. - # - method onElementDoubleClick {Option x y} { - - set script $options($Option) - if {$script != ""} { - set id [$win.tree nearest $x $y] - if {$id != ""} { - set path [$win.tree get -full $id] - eval $script [list [pathToName $path]] - } - } - } - # onElementContext Option x y X Y - # Invokes a context click (right button) for - # an element: - # Parameters: - # Option - Name of the option that should have the user script body. - # x,y - Coordinates of the click. - # X,Y - Absolute coordinates of the click. - # Note: - # The user script is called: - # userscript path X Y - # - method onElementContext {Option x y X Y} { - set script $options($Option) - if {$script != ""} { - set id [$win.tree nearest $x $y] - if {$id != ""} { - set path [$win.tree get -full $id] - eval $script [pathToName [list $path]] $X $Y - } - } - } - # selectElement x y - # Sets the selEction to the element at x,y - # - method selectElement {x y} { - set id [$win.tree nearest $x $y] - if {$id != ""} { - $win.tree selection clearall - $win.tree selection set $id $id - } - } - # nameToPath prefix name - # Converts name to a browser path for the group prefix. - # This is done by appending _BLTFOLDER to all but the last - # path element in name and prepending prefix. - # This is done to ensure that items can have the same name as - # folders e.g. a spectrum named a and one named a.b - # - # parameters: - # prefix - The path prefix e.g. Spectra - # name - The SpecTcl name of the item. - # - proc nameToPath {prefix name} { - set path $prefix - append path . [regsub {\.} $name _BLTFOLDER.] - return $path - - set nameList [split $name .] - foreach folder [lrange $nameList 0 end-1] { - append path . $folder _BLTFOLDER - } - append path . [lindex $nameList end] - return $path - } - # pathToName path - # Returns the name associated with an element. - # This will include the prefix (e.g. Spectrum). - # We strip the _BLTFOLDER from the end of all intermediate nodes - # in the name. - # - proc pathToName path { - set pathList [split $path .] - set prefix [lindex $pathList 0] - set terminal [lindex $pathList end] - set name $prefix - foreach node [lrange $pathList 1 end-1] { - append name . [regsub {_BLTFOLDER$} $node ""] - } - append name . $terminal - return $name - } - proc getPrefix name { - set nameList [split $name .] - return [lindex $nameList 0] - } - # makeParents path - # Takes a tree path (with the _BLTFOLDER bits in the path) - # and creates any neede parts of the folder hierarchy above the - # terminal node. - # These folders are labelled so that the _BLTFOLDER is missing. - # - method makeParents path { - set pathList [split $path .] - # Short cut optimization: - # Most of the time, users have more than one terminal in - # a single folder, If the entire path prior to our terminal - # exists, then we don't need to make anything. - - - - # - # The prefix is already made by definition. - # - set parentPath [lindex $pathList 0] - foreach element [lrange $pathList 1 end-1] { - append parentPath . $element - # - # If not found, need to make one - # - set label [regsub {_BLTFOLDER$} $element ""] - catch {$win.tree insert end $parentPath -label $label} - - - } - - - } - -} - Copied: trunk/SpecTcl/Gui/browser.tcl.old (from rev 2061, branches/SpecTcl-3.3-013/Gui/browser.tcl.old) =================================================================== --- trunk/SpecTcl/Gui/browser.tcl.old (rev 0) +++ trunk/SpecTcl/Gui/browser.tcl.old 2012-12-31 21:56:45 UTC (rev 2064) @@ -0,0 +1,1251 @@ +L +# This software is Copyright by the Board of Trustees of Michigan +# State University (c) Copyright 2005. +# +# You may use this software under the terms of the GNU public license +# (GPL). The terms of this license are described at: +# +# http://www.gnu.org/licenses/gpl.txt +# +# Author: +# Ron Fox +# NSCL +# Michigan State University +# East Lansing, MI 48824-1321 +# + +package provide browser 1.0 +package require BLT +package require snit + + +# browser provides a snit megawidget called "browser" which allows +# the user to browse SpecTcl objects in a hierarchical manner +# currently implemented as a blt treeview with a scrollbar. The object types that can +# be browsed include: +# Spectra +# Parameters (tree and otherwise) +# TreeVariables +# Gates +# +# Options: +# +# The following allow the attachment +# of scripts to the right click of top level folders. +# +# -spectrumfoldercommand script +# -parameterfoldercommand script +# -variablefoldercommand script +# -gatefoldercommand script +# +# The following allow the attachment of scripts +# to double-clicks of spectra, parameters, variablesand gates: +# +# -spectrumscript script +# -parameterscript script +# -variablescript script +# -gatescript script +# +# The following allow the attachment of scripts to right clicks +# of spectra, parameters, variables and gates: +# +# -spectrumrightclick script +# -parameterrightclick script +# -variablerightclick script +# -gaterightclick script +# +# The following control what is visible in the browser: +# +# -restrict {list of toplevel folders to view} (at present this is not dynamic!!). +# -detail bool +# -showcolumns {list of columns to show} (at presnt this is not dynamic!!). +# -filtergates script Run gate defs through script and only display those for which script is true +# -filterparameters script As for -filtergates but with parameters. +# -filterspectra script as for -filtergates but with specrtra. +#\ +# Geometric aspects: +# -width - Width of the browser window (at present not dynamic) +# -treewidth - Width of the tree column of the browser. (at present not dynamic) +# +# Each of these categories is represented as a folder whose contents contain the +# objects of that type. By convention in SpecTcl/Treeparameter, .'s are path +# separators. The tree hierarchy will generate, as needed, subfolders to reflect +# the pathing hierarchy generated by the user. +# + +# Locate ourself and read in the icons we require: +# + +namespace eval browser { + variable here [file dirname [info script]] +} + +image create photo ::browser::spectrumicon -format gif \ + -file [file join $::browser::here icons spectrumicon.gif] +image create photo ::browser::gateicon -format gif \ + -file [file join $::browser::here icons gateicon.gif] +image create photo ::browser::paramicon -format gif \ + -file [file join $::browser::here icons treeparicon.gif] +image create photo ::browser::varicon -format gif \ + -file [file join $::browser::here icons treevaricon.gif] +image create photo ::browser::axisicon -format gif \ + -file [file join $::browser::here icons axisicon.gif] +image create photo ::browser::pointicon -format gif \ + -file [file join $::browser::here icons pointico... [truncated message content] |
From: <ro...@us...> - 2013-02-16 16:22:37
|
Revision: 2069 http://sourceforge.net/p/nsclspectcl/code/2069 Author: ron-fox Date: 2013-02-16 16:22:34 +0000 (Sat, 16 Feb 2013) Log Message: ----------- * Open work on 3.3-014 * Fix griprint.cc buffer overlow printing spectra with numbers > 99. Thanks to Dave Caussyn@FSU. * Add Dave Caussyn to the credits page as he has contributed significantly over the years. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Display/griprint.cc trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp trunk/SpecTcl/configure.ac Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2013-02-04 10:47:14 UTC (rev 2068) +++ trunk/SpecTcl/CHANGELOG 2013-02-16 16:22:34 UTC (rev 2069) @@ -1004,4 +1004,8 @@ test. - Fixed various compile warnings in anticipation of compiler versions that will treat these as errors (finally solved the callbacks - as data in Xt casting problem). \ No newline at end of file + as data in Xt casting problem). +3.3-015 + * Fix error in griprint.cc - buffer overflow for printing spectra with + numbers above 99. Thanks to Dave Caussyn at FSU for finding this one. + \ No newline at end of file Modified: trunk/SpecTcl/Display/griprint.cc =================================================================== --- trunk/SpecTcl/Display/griprint.cc 2013-02-04 10:47:14 UTC (rev 2068) +++ trunk/SpecTcl/Display/griprint.cc 2013-02-16 16:22:34 UTC (rev 2069) @@ -2068,8 +2068,8 @@ // Add spectrum number... if(pAttributed->shownum()) { - char szBuf[6]; - sprintf(szBuf, "[%d] ", nSpectrum); + char szBuf[1024]; // Don't ever let it overflow. + snprintf(szBuf, sizeof(szBuf), "[%d] ", nSpectrum); Title += szBuf; } // Add spectrum name... Modified: trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp =================================================================== --- trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp 2013-02-04 10:47:14 UTC (rev 2068) +++ trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp 2013-02-16 16:22:34 UTC (rev 2069) @@ -687,9 +687,10 @@ cerr << " - Kevin Carnes James R. Macdonald Laboratory Kansas State University\n"; cerr << " for many good functionality suggestions and for catching some of my stupidities\n"; cerr << " - Dirk Weisshaar NSCL for many suggestions for performance and functional improvements\n"; + cerr << " - Dave Caussyn at Florida State University for comments and defect fixes\n"; cerr << " If your name should be on this list and is not, my apologies, please contact\n"; - cerr << " fo...@ns... and let me know what your contribution was and I will add you to\n"; - cerr << " the list of credits.\n"; + cerr << " fo...@ns... and let me know what your contribution was and I will add you to\n"; + cerr << " the list of credits.\n"; // Finally run the version script: Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2013-02-04 10:47:14 UTC (rev 2068) +++ trunk/SpecTcl/configure.ac 2013-02-16 16:22:34 UTC (rev 2069) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-013) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-014) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2013-03-26 16:59:23
|
Revision: 2070 http://sourceforge.net/p/nsclspectcl/code/2070 Author: ron-fox Date: 2013-03-26 16:59:21 +0000 (Tue, 26 Mar 2013) Log Message: ----------- * Issue #1697 - Search for Motif in arch specific libs too. * Fix redefinition of i in Spectrum formatting. Modified Paths: -------------- trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp trunk/SpecTcl/configure.ac Modified: trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp =================================================================== --- trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp 2013-02-16 16:22:34 UTC (rev 2069) +++ trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp 2013-03-26 16:59:21 UTC (rev 2070) @@ -411,10 +411,10 @@ Delimeter = '('; for (UInt_t i = 0; i < Parameters.size(); i++) { FindById p(Parameters[i]); - ParameterDictionaryIterator i = rDict.FindMatch(p); + ParameterDictionaryIterator pD = rDict.FindMatch(p); string name; - if (i != rDict.end()) { - name = i->second.getName(); + if (pD != rDict.end()) { + name = pD->second.getName(); } else { name = "*UNKNOWN*"; @@ -427,10 +427,10 @@ for (UInt_t i = 0; i < spectrumDef.vyParameters.size(); i++) { UInt_t pnum = spectrumDef.vyParameters[i]; FindById p(pnum); - ParameterDictionaryIterator i = rDict.FindMatch(p); + ParameterDictionaryIterator pD = rDict.FindMatch(p); string name; - if (i != rDict.end()) { - name = i->second.getName(); + if (pD != rDict.end()) { + name = pD->second.getName(); } else { name = "*UNKNOWN*"; @@ -445,9 +445,9 @@ for(UInt_t i = 0; i < Parameters.size(); i++) { UInt_t pnum = Parameters[i]; FindById p(pnum); - ParameterDictionaryIterator i = rDict.FindMatch(p); - if(i != rDict.end()) { - rStream << Delimeter << Quote << (*i).second.getName() << Quote; + ParameterDictionaryIterator pD = rDict.FindMatch(p); + if(pD != rDict.end()) { + rStream << Delimeter << Quote << (*pD).second.getName() << Quote; } else { rStream << Delimeter << (pnum == UINT_MAX ? Quote+Quote : "*UNKNOWN*"); Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2013-02-16 16:22:34 UTC (rev 2069) +++ trunk/SpecTcl/configure.ac 2013-03-26 16:59:21 UTC (rev 2070) @@ -175,6 +175,7 @@ # If in /usr/include we don't need anything: + if test $motif_h_found = no then motif_header_dirs="/usr/include/X11 /usr/include/X11R6 /usr/X11/include /usr/X11R6/include /usr/include /sw/include /usr/local/include" @@ -216,13 +217,35 @@ # /usr/lib (e.g. OSF1). # /sw/lib (Darwin lesstif installation). # /usr/local/lesstif/lib (normal lesstif install wo links?). +# Architecture specific place in linux. # # In this case assume we need an -rpath unless the extension is .dylib in which case # it's OS-X which doesn't require that sort of frippery. -# +# +libsysdir="" +if test "$host_os" == "linux-gnu" +then + kernel_full_version="$(uname -r)" + kernel_version="$(echo $kernel_full_version | cut -f1,2 -d.)" + AC_MSG_RESULT([Building on $host_os kernel $kernel_version]) + arch="$(uname -m)" + case $arch in + i[[3456]]86) + libsysdir="/usr/lib/i386-linux-gnu" + ;; + x86_64) + libsysdir="/usr/lib/x86_64-linux-gnu" + ;; + *) + + ;; + esac +fi + + libexts=".so .dylib .a" # prefer shared libs to static. -motiflibdirs="/usr/X11/lib /usr/X11R6/lib /sw/lib /usr/local/lesstif/lib /usr/lib" +motiflibdirs="/usr/X11/lib /usr/X11R6/lib /sw/lib /usr/local/lesstif/lib /usr/lib $libsysdir" motif_libdir="" motif_lib_found="no" Motif_Rpath="" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2013-04-15 13:29:49
|
Revision: 2071 http://sourceforge.net/p/nsclspectcl/code/2071 Author: ron-fox Date: 2013-04-15 13:29:46 +0000 (Mon, 15 Apr 2013) Log Message: ----------- Make this a foreign package so I don't get nagged by autoconf for too many missing files. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/configure.ac Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2013-03-26 16:59:21 UTC (rev 2070) +++ trunk/SpecTcl/CHANGELOG 2013-04-15 13:29:46 UTC (rev 2071) @@ -1008,4 +1008,5 @@ 3.3-015 * Fix error in griprint.cc - buffer overflow for printing spectra with numbers above 99. Thanks to Dave Caussyn at FSU for finding this one. - \ No newline at end of file + * Fix redef errors in NSCLAsciiFormatter.. + Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2013-03-26 16:59:21 UTC (rev 2070) +++ trunk/SpecTcl/configure.ac 2013-04-15 13:29:46 UTC (rev 2071) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-014) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-015) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2013-10-05 20:39:21
|
Revision: 2153 http://sourceforge.net/p/nsclspectcl/code/2153 Author: ron-fox Date: 2013-10-05 20:39:17 +0000 (Sat, 05 Oct 2013) Log Message: ----------- Properly integrate the V1729 FADC with vmusbSpecTcl Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/configure.ac trunk/SpecTcl/vmusb/spectclSetup.tcl Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2013-10-03 20:19:16 UTC (rev 2152) +++ trunk/SpecTcl/CHANGELOG 2013-10-05 20:39:17 UTC (rev 2153) @@ -1009,4 +1009,6 @@ * Fix error in griprint.cc - buffer overflow for printing spectra with numbers above 99. Thanks to Dave Caussyn at FSU for finding this one. * Fix redef errors in NSCLAsciiFormatter.. +3.3-016 + * Properly integrate the V1729 FADC with SpecTcl. Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2013-10-03 20:19:16 UTC (rev 2152) +++ trunk/SpecTcl/configure.ac 2013-10-05 20:39:17 UTC (rev 2153) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-015) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-016) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT Modified: trunk/SpecTcl/vmusb/spectclSetup.tcl =================================================================== --- trunk/SpecTcl/vmusb/spectclSetup.tcl 2013-10-03 20:19:16 UTC (rev 2152) +++ trunk/SpecTcl/vmusb/spectclSetup.tcl 2013-10-05 20:39:17 UTC (rev 2153) @@ -76,6 +76,21 @@ spectrum $paramname 1 $paramname [list [list $low $high $channels]] treeparameter -create $paramname $low $high $channels ""; # we don't know the units. } +## +# createFreezeButton +# +# When the first v1729 is seen in the stack, the freeze button is created: +# +proc createFreezeButton {} { + if {![winfo exists .freeze]} { + set freezeFadcSpectra 0 + checkbutton .freeze -text "Freeze fadc spectra"\ + -variable freezeFadcSpectra \ + -onvalue 1 -offvalue 0 + pack .freeze + + } +} #---------------------------------------------------------------------------- @@ -235,7 +250,36 @@ } return $param } +#--------------------------------------------------------------------------- # +# Build channel maps for the V1729 +# In this case, the channels are really place holders for +# spectra. +# parameters: +# param - Number of first available parametr. +# name - Name of the module we are managing. +# Returns: +# next available parameter number. +# +proc buildV1729Map {param name} { + global v1729postTriggers; # Post trigger value for time reorder. + global adcChannels; # Has parameter names. + + # Make a parameter and 2048 2K spectra for each parameter. + + foreach paramName $adcChannels($name) { + parameter $paramName $param + for {set i 0} {$i < 2048} {incr i} { + set spectrumName [format %04d.%s $i $paramName] + spectrum $spectrumName 1 $paramName {{0 2047 2048}} + } + incr param + } + paramMap $name $::typeV1729 $v1729postTriggers($name) $adcChannels($name) + return $param +} + +# # Hinp's unpacker takes a base name from # adcChannels and takes the chip mapping from # HINPChips @@ -425,6 +469,9 @@ set param [buildPSDMap $param $module] } elseif {$::readoutDeviceType($module) eq $::typeMADC32} { set param [buildMADC32Map $param $module] + } elseif {$::readoutDeviceType($module) eq $::typeV1729} { + set param [buildV1729Map $param $module] + createFreezeButton } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2013-10-08 18:36:58
|
Revision: 2157 http://sourceforge.net/p/nsclspectcl/code/2157 Author: ron-fox Date: 2013-10-08 18:36:55 +0000 (Tue, 08 Oct 2013) Log Message: ----------- Prepare for Jenkins build. Modified Paths: -------------- trunk/SpecTcl/Display/Makefile.am trunk/SpecTcl/SpecTcl/Makefile.am trunk/SpecTcl/configure.ac Added Paths: ----------- trunk/SpecTcl/testBuildTarball Modified: trunk/SpecTcl/Display/Makefile.am =================================================================== --- trunk/SpecTcl/Display/Makefile.am 2013-10-08 16:57:17 UTC (rev 2156) +++ trunk/SpecTcl/Display/Makefile.am 2013-10-08 18:36:55 UTC (rev 2157) @@ -1,5 +1,7 @@ bin_PROGRAMS = Xamine colorset +noinst_PROGRAMS = Xaminetest + HOMEDEF = -DHOME='"$(prefix)"' GRIFLAGS = -DGRI_DIR='"@gri_dir@"' -DGRI_CMD_DIR='"@gri_dir@"' LEXOUT = lex.yy.c @@ -93,8 +95,6 @@ $(CC) $(XCCFLAGS) defaultfile_lex.cc -check_PROGRAMS = Xaminetest -TESTS = $(check_PROGRAMS) include_HEADERS = Tab.h allocator.h dispshare.h helpmenu.h refreshctl.h\ TabP.h axes.h dispwind.h info.h scaling.h\ Modified: trunk/SpecTcl/SpecTcl/Makefile.am =================================================================== --- trunk/SpecTcl/SpecTcl/Makefile.am 2013-10-08 16:57:17 UTC (rev 2156) +++ trunk/SpecTcl/SpecTcl/Makefile.am 2013-10-08 18:36:55 UTC (rev 2157) @@ -9,7 +9,7 @@ -I@top_srcdir@/Fits \ -I@top_srcdir@/factories \ -I@top_srcdir@/DecoderRing \ - @TCL_FLAGS@ -DINSTALLED_IN='"$(prefix)"' @XINCLUDES@ + @TCL_FLAGS@ -DINSTALLED_IN='"$(prefix)"' @XINCLUDES@ -DVERSION='"@VERSION@"' install-exec-local: $(mkinstalldirs) $(prefix)/etc Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2013-10-08 16:57:17 UTC (rev 2156) +++ trunk/SpecTcl/configure.ac 2013-10-08 18:36:55 UTC (rev 2157) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-016) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-016, fo...@ns...) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT Added: trunk/SpecTcl/testBuildTarball =================================================================== --- trunk/SpecTcl/testBuildTarball (rev 0) +++ trunk/SpecTcl/testBuildTarball 2013-10-08 18:36:55 UTC (rev 2157) @@ -0,0 +1,20 @@ +#!/bin/bash -xe + + +rm -rf /tmp/sptrunk + +version=`grep AM_INIT_AUTOMAKE configure.ac | cut -f2 -d" " | sed s/,//` + +rm -rf SpecTcl-${version} + +tar xzf SpecTcl-${version}.tar.gz +cd SpecTcl-${version} + +./configure --prefix=/tmp/sptrunk +make clean all +make install +make check +make installcheck + +rm -rf SpecTcl-${version} +rm -rf /tmp/sptrunk Property changes on: trunk/SpecTcl/testBuildTarball ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2014-04-28 16:42:29
|
Revision: 2171 http://sourceforge.net/p/nsclspectcl/code/2171 Author: ron-fox Date: 2014-04-28 16:42:26 +0000 (Mon, 28 Apr 2014) Log Message: ----------- Get to compile/run on Ubuntu 14.04: * Configure needs to look in the architeture specific lib directories for libtcl/libtk. * inlucde stdlib.h in Xaminetest.cc to kill off implicit exit(2) complaints. Modified Paths: -------------- trunk/SpecTcl/Display/Xaminetest.c trunk/SpecTcl/configure.ac Modified: trunk/SpecTcl/Display/Xaminetest.c =================================================================== --- trunk/SpecTcl/Display/Xaminetest.c 2014-04-10 17:23:27 UTC (rev 2170) +++ trunk/SpecTcl/Display/Xaminetest.c 2014-04-28 16:42:26 UTC (rev 2171) @@ -8,9 +8,9 @@ #include <string.h> #include <sys/types.h> #include <sys/wait.h> +#include <stdlib.h> - #ifndef FALSE #define FALSE 0 #endif Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2014-04-10 17:23:27 UTC (rev 2170) +++ trunk/SpecTcl/configure.ac 2014-04-28 16:42:26 UTC (rev 2171) @@ -602,7 +602,9 @@ # We look for the following # /sw/lib # /usr/lib/libtcl.{so,dylib,a} - link to a default lib. +# /usr/lib/x86_64-linux-gnu/libtcl<version>.{so,dylib,a} # /usr/lib/libtcl<version>.{so,dylib,a} - link to a specific lib. +# /usr/lib/i386-linux-gnu # If --with-tcl-libdir=dir is supplied, that directory is # searched first. # ASSUMPTIONS: libtcl and libtk will have the same naming conventions. @@ -619,7 +621,7 @@ [ --with-tcl-libdir=dir Specify where the tcl libraries live.], [tcl_libsearchpath=$withval]) -tcl_libsearchpath="$tcl_libsearchpath /sw/lib /usr/lib /usr/local/lib" +tcl_libsearchpath="$tcl_libsearchpath /sw/lib /usr/lib/x86_64-linux-gnu /usr/lib /usr/local/lib /usr/lib/i386-linux-gnu " tcl_libfiles="" for v in ${tcl_versions} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2015-02-03 19:41:35
|
Revision: 2238 http://sourceforge.net/p/nsclspectcl/code/2238 Author: ron-fox Date: 2015-02-03 19:41:31 +0000 (Tue, 03 Feb 2015) Log Message: ----------- After merger from 3.4-017 -> 3.4-018 Preparing to branch this off and make 3.4 the trunk development arc. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp trunk/SpecTcl/configure.ac trunk/SpecTcl/doc/Commands/spectrum.htm trunk/SpecTcl/filtsplit/Makefile.am trunk/SpecTcl/vmusb/CPSD.cpp trunk/SpecTcl/vmusb/spectclSetup.tcl Property Changed: ---------------- trunk/SpecTcl/ Index: trunk/SpecTcl =================================================================== --- trunk/SpecTcl 2015-02-02 18:41:59 UTC (rev 2237) +++ trunk/SpecTcl 2015-02-03 19:41:31 UTC (rev 2238) Property changes on: trunk/SpecTcl ___________________________________________________________________ Modified: svn:mergeinfo ## -1,6 +1,7 ## /branches/3.3-007-dev:1983-1986 /branches/3.3-008-dev:1987-1996 /branches/3.3-009-development:2000-2014 +/branches/3.3-maintenance:2073-2237 /branches/SpecTcl-3.3-010-development:2016-2031 /branches/SpecTcl-3.3-013:2051-2061 /tags/SpecTcl-3.3-013-premerge:2062-2063 \ No newline at end of property Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2015-02-02 18:41:59 UTC (rev 2237) +++ trunk/SpecTcl/CHANGELOG 2015-02-03 19:41:31 UTC (rev 2238) @@ -1011,4 +1011,7 @@ * Fix redef errors in NSCLAsciiFormatter.. 3.3-016 * Properly integrate the V1729 FADC with SpecTcl. - + * Fix error in vmusb/spectclSetup.tcl - typo in V1x90 setup. + +3.3-017 + * Fix error with m2d gates - Only the first point was correct. Modified: trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp =================================================================== --- trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp 2015-02-02 18:41:59 UTC (rev 2237) +++ trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp 2015-02-03 19:41:31 UTC (rev 2238) @@ -690,8 +690,8 @@ vector<FPoint> result; for (int i =0; i < rawPoints.size(); i++) { - Float_t x = a[i].AxisToParameter(rawPoints[i].X()); - Float_t y = a[i+1].AxisToParameter(rawPoints[i].Y()); + Float_t x = a[firstAxis].AxisToParameter(rawPoints[i].X()); + Float_t y = a[firstAxis+1].AxisToParameter(rawPoints[i].Y()); result.push_back(FPoint(x,y)); } Modified: trunk/SpecTcl/configure.ac =================================================================== --- trunk/SpecTcl/configure.ac 2015-02-02 18:41:59 UTC (rev 2237) +++ trunk/SpecTcl/configure.ac 2015-02-03 19:41:31 UTC (rev 2238) @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(SpecTcl, 3.3-016, fo...@ns...) +AM_INIT_AUTOMAKE(SpecTcl, 3.3-018) AC_CONFIG_MACRO_DIR([m4]) AC_EXEEXT Modified: trunk/SpecTcl/doc/Commands/spectrum.htm =================================================================== --- trunk/SpecTcl/doc/Commands/spectrum.htm 2015-02-02 18:41:59 UTC (rev 2237) +++ trunk/SpecTcl/doc/Commands/spectrum.htm 2015-02-03 19:41:31 UTC (rev 2238) @@ -1,16 +1,16 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> <html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" +xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> -<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1"> +<meta http-equiv=Content-Type content="text/html; charset=windows-1252"> <meta name=ProgId content=Word.Document> -<meta name=Generator content="Microsoft Word 9"> -<meta name=Originator content="Microsoft Word 9"> -<link rel=File-List href="./spectrum_files/filelist.xml"> -<link rel=Edit-Time-Data href="./spectrum_files/editdata.mso"> +<meta name=Generator content="Microsoft Word 15"> +<meta name=Originator content="Microsoft Word 15"> +<link rel=File-List href="spectrum_files/filelist.xml"> +<link rel=Edit-Time-Data href="spectrum_files/editdata.mso"> <!--[if !mso]> <style> v\:* {behavior:url(#default#VML);} @@ -23,108 +23,869 @@ <!--[if gte mso 9]><xml> <o:DocumentProperties> <o:Author>fox</o:Author> - <o:LastAuthor>fox</o:LastAuthor> - <o:Revision>7</o:Revision> - <o:TotalTime>14</o:TotalTime> + <o:LastAuthor>Fox, Ron</o:LastAuthor> + <o:Revision>9</o:Revision> + <o:TotalTime>15</o:TotalTime> <o:Created>2004-04-01T14:02:00Z</o:Created> - <o:LastSaved>2006-09-29T13:30:00Z</o:LastSaved> - <o:Pages>5</o:Pages> - <o:Words>1778</o:Words> - <o:Characters>10137</o:Characters> + <o:LastSaved>2014-07-10T11:45:00Z</o:LastSaved> + <o:Pages>9</o:Pages> + <o:Words>2197</o:Words> + <o:Characters>12525</o:Characters> <o:Company>MSU</o:Company> - <o:Lines>84</o:Lines> - <o:Paragraphs>20</o:Paragraphs> - <o:CharactersWithSpaces>12448</o:CharactersWithSpaces> - <o:Version>9.6926</o:Version> + <o:Lines>104</o:Lines> + <o:Paragraphs>29</o:Paragraphs> + <o:CharactersWithSpaces>14693</o:CharactersWithSpaces> + <o:Version>15.00</o:Version> </o:DocumentProperties> </xml><![endif]--> +<link rel=themeData href="spectrum_files/themedata.thmx"> +<link rel=colorSchemeMapping href="spectrum_files/colorschememapping.xml"> +<!--[if gte mso 9]><xml> + <w:WordDocument> + <w:View>Print</w:View> + <w:SpellingState>Clean</w:SpellingState> + <w:GrammarState>Clean</w:GrammarState> + <w:TrackMoves>false</w:TrackMoves> + <w:TrackFormatting/> + <w:ValidateAgainstSchemas/> + <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> + <w:IgnoreMixedContent>false</w:IgnoreMixedContent> + <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> + <w:DoNotPromoteQF/> + <w:LidThemeOther>EN-US</w:LidThemeOther> + <w:LidThemeAsian>X-NONE</w:LidThemeAsian> + <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript> + <w:Compatibility> + <w:BreakWrappedTables/> + <w:SplitPgBreakAndParaMark/> + </w:Compatibility> + <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> + <m:mathPr> + <m:mathFont m:val="Cambria Math"/> + <m:brkBin m:val="before"/> + <m:brkBinSub m:val="--"/> + <m:smallFrac m:val="off"/> + <m:dispDef/> + <m:lMargin m:val="0"/> + <m:rMargin m:val="0"/> + <m:defJc m:val="centerGroup"/> + <m:wrapIndent m:val="1440"/> + <m:intLim m:val="subSup"/> + <m:naryLim m:val="undOvr"/> + </m:mathPr></w:WordDocument> +</xml><![endif]--><!--[if gte mso 9]><xml> + <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="false" + DefSemiHidden="false" DefQFormat="false" DefPriority="99" + LatentStyleCount="371"> + <w:LsdException Locked="false" Priority="0" QFormat="true" Name="Normal"/> + <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 1"/> + <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/> + <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/> + <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/> + <w:LsdException Locked="false" Priority="9" SemiHidden="true" + UnhideWhenUsed="true" QFormat="true" Name="heading 5"/> + <w:LsdException Locked="false" Priority="9" SemiHidden="true" + UnhideWhenUsed="true" QFormat="true" Name="heading 6"/> + <w:LsdException Locked="false" Priority="9" SemiHidden="true" + UnhideWhenUsed="true" QFormat="true" Name="heading 7"/> + <w:LsdException Locked="false" Priority="9" SemiHidden="true" + UnhideWhenUsed="true" QFormat="true" Name="heading 8"/> + <w:LsdException Locked="false" Priority="9" SemiHidden="true" + UnhideWhenUsed="true" QFormat="true" Name="heading 9"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 5"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 6"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 7"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 8"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index 9"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 1"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 2"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 3"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 4"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 5"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 6"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 7"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 8"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" Name="toc 9"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Normal Indent"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="footnote text"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="annotation text"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="header"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="footer"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="index heading"/> + <w:LsdException Locked="false" Priority="35" SemiHidden="true" + UnhideWhenUsed="true" QFormat="true" Name="caption"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="table of figures"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="envelope address"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="envelope return"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="footnote reference"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="annotation reference"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="line number"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="page number"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="endnote reference"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="endnote text"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="table of authorities"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="macro"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="toa heading"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Bullet"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Number"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List 5"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Bullet 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Bullet 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Bullet 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Bullet 5"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Number 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Number 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Number 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Number 5"/> + <w:LsdException Locked="false" Priority="10" QFormat="true" Name="Title"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Closing"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Signature"/> + <w:LsdException Locked="false" Priority="1" SemiHidden="true" + UnhideWhenUsed="true" Name="Default Paragraph Font"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text Indent"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Continue"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Continue 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Continue 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Continue 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="List Continue 5"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Message Header"/> + <w:LsdException Locked="false" Priority="11" QFormat="true" Name="Subtitle"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Salutation"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Date"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text First Indent"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text First Indent 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Note Heading"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text Indent 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Body Text Indent 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Block Text"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Hyperlink"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="FollowedHyperlink"/> + <w:LsdException Locked="false" Priority="22" QFormat="true" Name="Strong"/> + <w:LsdException Locked="false" Priority="20" QFormat="true" Name="Emphasis"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Document Map"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Plain Text"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="E-mail Signature"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Top of Form"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Bottom of Form"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Normal (Web)"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Acronym"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Address"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Cite"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Code"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Definition"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Keyboard"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Preformatted"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Sample"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Typewriter"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="HTML Variable"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Normal Table"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="annotation subject"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="No List"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Outline List 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Outline List 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Outline List 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Simple 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Simple 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Simple 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Classic 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Classic 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Classic 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Classic 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Colorful 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Colorful 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Colorful 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Columns 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Columns 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Columns 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Columns 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Columns 5"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 5"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 6"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 7"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Grid 8"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 4"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 5"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 6"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 7"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table List 8"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table 3D effects 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table 3D effects 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table 3D effects 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Contemporary"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Elegant"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Professional"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Subtle 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Subtle 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Web 1"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Web 2"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Web 3"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Balloon Text"/> + <w:LsdException Locked="false" Priority="39" Name="Table Grid"/> + <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" + Name="Table Theme"/> + <w:LsdException Locked="false" SemiHidden="true" Name="Placeholder Text"/> + <w:LsdException Locked="false" Priority="1" QFormat="true" Name="No Spacing"/> + <w:LsdException Locked="false" Priority="60" Name="Light Shading"/> + <w:LsdException Locked="false" Priority="61" Name="Light List"/> + <w:LsdException Locked="false" Priority="62" Name="Light Grid"/> + <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1"/> + <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2"/> + <w:LsdException Locked="false" Priority="65" Name="Medium List 1"/> + <w:LsdException Locked="false" Priority="66" Name="Medium List 2"/> + <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1"/> + <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2"/> + <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3"/> + <w:LsdException Locked="false" Priority="70" Name="Dark List"/> + <w:LsdException Locked="false" Priority="71" Name="Colorful Shading"/> + <w:LsdException Locked="false" Priority="72" Name="Colorful List"/> + <w:LsdException Locked="false" Priority="73" Name="Colorful Grid"/> + <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 1"/> + <w:LsdException Locked="false" Priority="61" Name="Light List Accent 1"/> + <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 1"/> + <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 1"/> + <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 1"/> + <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 1"/> + <w:LsdException Locked="false" SemiHidden="true" Name="Revision"/> + <w:LsdException Locked="false" Priority="34" QFormat="true" + Name="List Paragraph"/> + <w:LsdException Locked="false" Priority="29" QFormat="true" Name="Quote"/> + <w:LsdException Locked="false" Priority="30" QFormat="true" + Name="Intense Quote"/> + <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 1"/> + <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 1"/> + <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 1"/> + <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 1"/> + <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 1"/> + <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 1"/> + <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 1"/> + <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 1"/> + <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 2"/> + <w:LsdException Locked="false" Priority="61" Name="Light List Accent 2"/> + <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 2"/> + <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 2"/> + <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 2"/> + <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 2"/> + <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 2"/> + <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 2"/> + <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 2"/> + <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 2"/> + <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 2"/> + <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 2"/> + <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 2"/> + <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 2"/> + <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 3"/> + <w:LsdException Locked="false" Priority="61" Name="Light List Accent 3"/> + <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 3"/> + <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 3"/> + <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 3"/> + <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 3"/> + <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 3"/> + <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 3"/> + <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 3"/> + <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 3"/> + <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 3"/> + <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 3"/> + <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 3"/> + <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 3"/> + <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 4"/> + <w:LsdException Locked="false" Priority="61" Name="Light List Accent 4"/> + <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 4"/> + <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 4"/> + <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 4"/> + <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 4"/> + <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 4"/> + <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 4"/> + <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 4"/> + <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 4"/> + <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 4"/> + <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 4"/> + <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 4"/> + <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 4"/> + <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 5"/> + <w:LsdException Locked="false" Priority="61" Name="Light List Accent 5"/> + <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 5"/> + <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 5"/> + <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 5"/> + <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 5"/> + <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 5"/> + <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 5"/> + <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 5"/> + <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 5"/> + <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 5"/> + <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 5"/> + <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 5"/> + <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 5"/> + <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 6"/> + <w:LsdException Locked="false" Priority="61" Name="Light List Accent 6"/> + <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 6"/> + <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 6"/> + <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 6"/> + <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 6"/> + <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 6"/> + <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 6"/> + <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 6"/> + <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 6"/> + <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 6"/> + <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 6"/> + <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 6"/> + <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 6"/> + <w:LsdException Locked="false" Priority="19" QFormat="true" + Name="Subtle Emphasis"/> + <w:LsdException Locked="false" Priority="21" QFormat="true" + Name="Intense Emphasis"/> + <w:LsdException Locked="false" Priority="31" QFormat="true" + Name="Subtle Reference"/> + <w:LsdException Locked="false" Priority="32" QFormat="true" + Name="Intense Reference"/> + <w:LsdException Locked="false" Priority="33" QFormat="true" Name="Book Title"/> + <w:LsdException Locked="false" Priority="37" SemiHidden="true" + UnhideWhenUsed="true" Name="Bibliography"/> + <w:LsdException Locked="false" Priority="39" SemiHidden="true" + UnhideWhenUsed="true" QFormat="true" Name="TOC Heading"/> + <w:LsdException Locked="false" Priority="41" Name="Plain Table 1"/> + <w:LsdException Locked="false" Priority="42" Name="Plain Table 2"/> + <w:LsdException Locked="false" Priority="43" Name="Plain Table 3"/> + <w:LsdException Locked="false" Priority="44" Name="Plain Table 4"/> + <w:LsdException Locked="false" Priority="45" Name="Plain Table 5"/> + <w:LsdException Locked="false" Priority="40" Name="Grid Table Light"/> + <w:LsdException Locked="false" Priority="46" Name="Grid Table 1 Light"/> + <w:LsdException Locked="false" Priority="47" Name="Grid Table 2"/> + <w:LsdException Locked="false" Priority="48" Name="Grid Table 3"/> + <w:LsdException Locked="false" Priority="49" Name="Grid Table 4"/> + <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark"/> + <w:LsdException Locked="false" Priority="51" Name="Grid Table 6 Colorful"/> + <w:LsdException Locked="false" Priority="52" Name="Grid Table 7 Colorful"/> + <w:LsdException Locked="false" Priority="46" + Name="Grid Table 1 Light Accent 1"/> + <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 1"/> + <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 1"/> + <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 1"/> + <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 1"/> + <w:LsdException Locked="false" Priority="51" + Name="Grid Table 6 Colorful Accent 1"/> + <w:LsdException Locked="false" Priority="52" + Name="Grid Table 7 Colorful Accent 1"/> + <w:LsdException Locked="false" Priority="46" + Name="Grid Table 1 Light Accent 2"/> + <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 2"/> + <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 2"/> + <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 2"/> + <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 2"/> + <w:LsdException Locked="false" Priority="51" + Name="Grid Table 6 Colorful Accent 2"/> + <w:LsdException Locked="false" Priority="52" + Name="Grid Table 7 Colorful Accent 2"/> + <w:LsdException Locked="false" Priority="46" + Name="Grid Table 1 Light Accent 3"/> + <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 3"/> + <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 3"/> + <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 3"/> + <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 3"/> + <w:LsdException Locked="false" Priority="51" + Name="Grid Table 6 Colorful Accent 3"/> + <w:LsdException Locked="false" Priority="52" + Name="Grid Table 7 Colorful Accent 3"/> + <w:LsdException Locked="false" Priority="46" + Name="Grid Table 1 Light Accent 4"/> + <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 4"/> + <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 4"/> + <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 4"/> + <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 4"/> + <w:LsdException Locked="false" Priority="51" + Name="Grid Table 6 Colorful Accent 4"/> + <w:LsdException Locked="false" Priority="52" + Name="Grid Table 7 Colorful Accent 4"/> + <w:LsdException Locked="false" Priority="46" + Name="Grid Table 1 Light Accent 5"/> + <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 5"/> + <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 5"/> + <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 5"/> + <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 5"/> + <w:LsdException Locked="false" Priority="51" + Name="Grid Table 6 Colorful Accent 5"/> + <w:LsdException Locked="false" Priority="52" + Name="Grid Table 7 Colorful Accent 5"/> + <w:LsdException Locked="false" Priority="46" + Name="Grid Table 1 Light Accent 6"/> + <w:LsdException Locked="false" Priority="47" Name="Grid Table 2 Accent 6"/> + <w:LsdException Locked="false" Priority="48" Name="Grid Table 3 Accent 6"/> + <w:LsdException Locked="false" Priority="49" Name="Grid Table 4 Accent 6"/> + <w:LsdException Locked="false" Priority="50" Name="Grid Table 5 Dark Accent 6"/> + <w:LsdException Locked="false" Priority="51" + Name="Grid Table 6 Colorful Accent 6"/> + <w:LsdException Locked="false" Priority="52" + Name="Grid Table 7 Colorful Accent 6"/> + <w:LsdException Locked="false" Priority="46" Name="List Table 1 Light"/> + <w:LsdException Locked="false" Priority="47" Name="List Table 2"/> + <w:LsdException Locked="false" Priority="48" Name="List Table 3"/> + <w:LsdException Locked="false" Priority="49" Name="List Table 4"/> + <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark"/> + <w:LsdException Locked="false" Priority="51" Name="List Table 6 Colorful"/> + <w:LsdException Locked="false" Priority="52" Name="List Table 7 Colorful"/> + <w:LsdException Locked="false" Priority="46" + Name="List Table 1 Light Accent 1"/> + <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 1"/> + <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 1"/> + <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 1"/> + <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 1"/> + <w:LsdException Locked="false" Priority="51" + Name="List Table 6 Colorful Accent 1"/> + <w:LsdException Locked="false" Priority="52" + Name="List Table 7 Colorful Accent 1"/> + <w:LsdException Locked="false" Priority="46" + Name="List Table 1 Light Accent 2"/> + <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 2"/> + <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 2"/> + <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 2"/> + <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 2"/> + <w:LsdException Locked="false" Priority="51" + Name="List Table 6 Colorful Accent 2"/> + <w:LsdException Locked="false" Priority="52" + Name="List Table 7 Colorful Accent 2"/> + <w:LsdException Locked="false" Priority="46" + Name="List Table 1 Light Accent 3"/> + <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 3"/> + <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 3"/> + <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 3"/> + <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 3"/> + <w:LsdException Locked="false" Priority="51" + Name="List Table 6 Colorful Accent 3"/> + <w:LsdException Locked="false" Priority="52" + Name="List Table 7 Colorful Accent 3"/> + <w:LsdException Locked="false" Priority="46" + Name="List Table 1 Light Accent 4"/> + <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 4"/> + <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 4"/> + <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 4"/> + <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 4"/> + <w:LsdException Locked="false" Priority="51" + Name="List Table 6 Colorful Accent 4"/> + <w:LsdException Locked="false" Priority="52" + Name="List Table 7 Colorful Accent 4"/> + <w:LsdException Locked="false" Priority="46" + Name="List Table 1 Light Accent 5"/> + <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 5"/> + <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 5"/> + <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 5"/> + <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 5"/> + <w:LsdException Locked="false" Priority="51" + Name="List Table 6 Colorful Accent 5"/> + <w:LsdException Locked="false" Priority="52" + Name="List Table 7 Colorful Accent 5"/> + <w:LsdException Locked="false" Priority="46" + Name="List Table 1 Light Accent 6"/> + <w:LsdException Locked="false" Priority="47" Name="List Table 2 Accent 6"/> + <w:LsdException Locked="false" Priority="48" Name="List Table 3 Accent 6"/> + <w:LsdException Locked="false" Priority="49" Name="List Table 4 Accent 6"/> + <w:LsdException Locked="false" Priority="50" Name="List Table 5 Dark Accent 6"/> + <w:LsdException Locked="false" Priority="51" + Name="List Table 6 Colorful Accent 6"/> + <w:LsdException Locked="false" Priority="52" + Name="List Table 7 Colorful Accent 6"/> + </w:LatentStyles> +</xml><![endif]--> <style> -<!-- +<!--@list L3:level1 + {F0B7;} + + /* Font Definitions */ + @font-face + {font-family:"Cambria Math"; + panose-1:2 4 5 3 5 4 6 3 2 4; + mso-font-charset:1; + mso-generic-font-family:roman; + mso-font-format:other; + mso-font-pitch:variable; + mso-font-signature:0 0 0 0 0 0;} +@font-face + {font-family:Consolas; + panose-1:2 11 6 9 2 2 4 3 2 4; + mso-font-charset:0; + mso-generic-font-family:roman; + mso-font-format:other; + mso-font-pitch:auto; + mso-font-signature:0 0 0 0 0 0;} /* Style Definitions */ -p.MsoNormal, li.MsoNormal, div.MsoNormal - {mso-style-parent:""; + p.MsoNormal, li.MsoNormal, div.MsoNormal + {mso-style-unhide:no; + mso-style-qformat:yes; + mso-style-parent:""; margin:0in; margin-bottom:.0001pt; mso-pagination:widow-orphan; font-size:12.0pt; - font-family:"Times New Roman"; + font-family:"Times New Roman","serif"; mso-fareast-font-family:"Times New Roman";} h1 - {margin-right:0in; + {mso-style-priority:9; + mso-style-unhide:no; + mso-style-qformat:yes; + mso-style-link:"Heading 1 Char"; mso-margin-top-alt:auto; + margin-right:0in; mso-margin-bottom-alt:auto; margin-left:0in; mso-pagination:widow-orphan; mso-outline-level:1; font-size:24.0pt; - font-family:"Times New Roman"; - mso-font-kerning:18.0pt; + font-family:"Times New Roman","serif"; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:minor-fareast; font-weight:bold;} h2 - {margin-right:0in; + {mso-style-priority:9; + mso-style-unhide:no; + mso-style-qformat:yes; + mso-style-link:"Heading 2 Char"; mso-margin-top-alt:auto; + margin-right:0in; mso-margin-bottom-alt:auto; margin-left:0in; mso-pagination:widow-orphan; mso-outline-level:2; font-size:18.0pt; - font-family:"Times New Roman"; + font-family:"Times New Roman","serif"; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:minor-fareast; font-weight:bold;} h3 - {margin-right:0in; + {mso-style-priority:9; + mso-style-unhide:no; + mso-style-qformat:yes; + mso-style-link:"Heading 3 Char"; mso-margin-top-alt:auto; + margin-right:0in; mso-margin-bottom-alt:auto; margin-left:0in; mso-pagination:widow-orphan; mso-outline-level:3; font-size:13.5pt; - font-family:"Times New Roman"; + font-family:"Times New Roman","serif"; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:minor-fareast; font-weight:bold;} h4 - {margin-right:0in; + {mso-style-priority:9; + mso-style-unhide:no; + mso-style-qformat:yes; + mso-style-link:"Heading 4 Char"; mso-margin-top-alt:auto; + margin-right:0in; mso-margin-bottom-alt:auto; margin-left:0in; mso-pagination:widow-orphan; mso-outline-level:4; font-size:12.0pt; - font-family:"Times New Roman"; + font-family:"Times New Roman","serif"; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:minor-fareast; font-weight:bold;} a:link, span.MsoHyperlink - {color:blue; + {mso-style-noshow:yes; + mso-style-priority:99; + color:blue; text-decoration:underline; text-underline:single;} a:visited, span.MsoHyperlinkFollowed - {color:blue; + {mso-style-noshow:yes; + mso-style-priority:99; + color:blue; text-decoration:underline; text-underline:single;} p - {margin-right:0in; + {mso-style-noshow:yes; + mso-style-priority:99; mso-margin-top-alt:auto; + margin-right:0in; mso-margin-bottom-alt:auto; margin-left:0in; mso-pagination:widow-orphan; font-size:12.0pt; - font-family:"Times New Roman"; + font-family:"Times New Roman","serif"; mso-fareast-font-family:"Times New Roman";} pre - {margin:0in; + {mso-style-noshow:yes; + mso-style-priority:99; + mso-style-link:"HTML Preformatted Char"; + margin:0in; margin-bottom:.0001pt; mso-pagination:widow-orphan; tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt; font-size:10.0pt; font-family:"Courier New"; mso-fareast-font-family:"Courier New";} -@page Section1 +span.Heading1Char + {mso-style-name:"Heading 1 Char"; + mso-style-priority:9; + mso-style-unhide:no; + mso-style-locked:yes; + mso-style-link:"Heading 1"; + mso-ansi-font-size:16.0pt; + mso-bidi-font-size:16.0pt; + font-family:"Calibri Light","sans-serif"; + mso-ascii-font-family:"Calibri Light"; + mso-ascii-theme-font:major-latin; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:major-fareast; + mso-hansi-font-family:"Calibri Light"; + mso-hansi-theme-font:major-latin; + mso-bidi-font-family:"Times New Roman"; + mso-bidi-theme-font:major-bidi; + color:#2E74B5; + mso-themecolor:accent1; + mso-themeshade:191;} +span.Heading2Char + {mso-style-name:"Heading 2 Char"; + mso-style-noshow:yes; + mso-style-priority:9; + mso-style-unhide:no; + mso-style-locked:yes; + mso-style-link:"Heading 2"; + mso-ansi-font-size:13.0pt; + mso-bidi-font-size:13.0pt; + font-family:"Calibri Light","sans-serif"; + mso-ascii-font-family:"Calibri Light"; + mso-ascii-theme-font:major-latin; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:major-fareast; + mso-hansi-font-family:"Calibri Light"; + mso-hansi-theme-font:major-latin; + mso-bidi-font-family:"Times New Roman"; + mso-bidi-theme-font:major-bidi; + color:#2E74B5; + mso-themecolor:accent1; + mso-themeshade:191;} +span.Heading3Char + {mso-style-name:"Heading 3 Char"; + mso-style-noshow:yes; + mso-style-priority:9; + mso-style-unhide:no; + mso-style-locked:yes; + mso-style-link:"Heading 3"; + mso-ansi-font-size:12.0pt; + mso-bidi-font-size:12.0pt; + font-family:"Calibri Light","sans-serif"; + mso-ascii-font-family:"Calibri Light"; + mso-ascii-theme-font:major-latin; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:major-fareast; + mso-hansi-font-family:"Calibri Light"; + mso-hansi-theme-font:major-latin; + mso-bidi-font-family:"Times New Roman"; + mso-bidi-theme-font:major-bidi; + color:#1F4D78; + mso-themecolor:accent1; + mso-themeshade:127;} +span.Heading4Char + {mso-style-name:"Heading 4 Char"; + mso-style-noshow:yes; + mso-style-priority:9; + mso-style-unhide:no; + mso-style-locked:yes; + mso-style-link:"Heading 4"; + mso-ansi-font-size:12.0pt; + mso-bidi-font-size:12.0pt; + font-family:"Calibri Light","sans-serif"; + mso-ascii-font-family:"Calibri Light"; + mso-ascii-theme-font:major-latin; + mso-fareast-font-family:"Times New Roman"; + mso-fareast-theme-font:major-fareast; + mso-hansi-font-family:"Calibri Light"; + mso-hansi-theme-font:major-latin; + mso-bidi-font-family:"Times New Roman"; + mso-bidi-theme-font:major-bidi; + color:#2E74B5; + mso-themecolor:accent1; + mso-themeshade:191; + font-style:italic;} +span.HTMLPreformattedChar + {mso-style-name:"HTML Preformatted Char"; + mso-style-noshow:yes; + mso-style-priority:99; + mso-style-unhide:no; + mso-style-locked:yes; + mso-style-link:"HTML Preformatted"; + font-family:"Consolas","serif"; + mso-ascii-font-family:Consolas; + mso-hansi-font-family:Consolas;} +span.SpellE + {mso-style-name:""; + mso-spl-e:yes;} +span.GramE + {mso-style-name:""; + mso-gram-e:yes;} +.MsoChpDefault + {mso-style-type:export-only; + mso-default-props:yes; + font-size:10.0pt; + mso-ansi-font-size:10.0pt; + mso-bidi-font-size:10.0pt;} +@page WordSection1 {size:8.5in 11.0in; margin:1.0in 1.25in 1.0in 1.25in; mso-header-margin:.5in; mso-footer-margin:.5in; mso-paper-source:0;} -div.Section1 - {page:Section1;} +div.WordSection1 + {page:WordSection1;} /* List Definitions */ -@list l0 + @list l0 {mso-list-id:76709646; mso-list-type:hybrid; mso-list-template-ids:819238376 1650872792 882527278 198848452 -839220918 1583501874 -1659833672 462859120 1491916878 -832806956;} @@ -136,6 +897,38 @@ text-indent:-.25in; mso-ansi-font-size:10.0pt; font-family:Symbol;} +@list l0:level2 + {mso-level-tab-stop:1.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l0:level3 + {mso-level-tab-stop:1.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l0:level4 + {mso-level-tab-stop:2.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l0:level5 + {mso-level-tab-stop:2.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l0:level6 + {mso-level-tab-stop:3.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l0:level7 + {mso-level-tab-stop:3.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l0:level8 + {mso-level-tab-stop:4.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l0:level9 + {mso-level-tab-stop:4.5in; + mso-level-number-position:left; + text-indent:-.25in;} @list l1 {mso-list-id:581448951; mso-list-type:hybrid; @@ -148,6 +941,38 @@ text-indent:-.25in; mso-ansi-font-size:10.0pt; font-family:Symbol;} +@list l1:level2 + {mso-level-tab-stop:1.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l1:level3 + {mso-level-tab-stop:1.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l1:level4 + {mso-level-tab-stop:2.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l1:level5 + {mso-level-tab-stop:2.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l1:level6 + {mso-level-tab-stop:3.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l1:level7 + {mso-level-tab-stop:3.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l1:level8 + {mso-level-tab-stop:4.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l1:level9 + {mso-level-tab-stop:4.5in; + mso-level-number-position:left; + text-indent:-.25in;} @list l2 {mso-list-id:596712811; mso-list-type:hybrid; @@ -160,46 +985,210 @@ text-indent:-.25in; mso-ansi-font-size:10.0pt; font-family:Symbol;} +@list l2:level2 + {mso-level-tab-stop:1.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l2:level3 + {mso-level-tab-stop:1.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l2:level4 + {mso-level-tab-stop:2.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l2:level5 + {mso-level-tab-stop:2.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l2:level6 + {mso-level-tab-stop:3.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l2:level7 + {mso-level-tab-stop:3.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l2:level8 + {mso-level-tab-stop:4.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l2:level9 + {mso-level-tab-stop:4.5in; + mso-level-number-position:left; + text-indent:-.25in;} @list l3 + {mso-list-id:1154566575; + mso-list-template-ids:555281410;} +@list l3:level1 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:.5in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level2 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:1.0in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level3 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:1.5in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level4 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:2.0in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level5 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:2.5in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level6 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:3.0in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level7 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:3.5in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level8 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:4.0in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l3:level9 + {mso-level-number-format:bullet; + mso-level-text:\F0B7; + mso-level-tab-stop:4.5in; + mso-level-number-position:left; + text-indent:-.25in; + mso-ansi-font-size:10.0pt; + font-family:Symbol;} +@list l4 {mso-list-id:1873690570; mso-list-type:hybrid; mso-list-template-ids:-151981646 -288182996 19688730 247338382 1135761690 -806847966 -943448650 1243382536 1460013002 161523684;} -@list l3:level1 +@list l4:level1 {mso-level-number-format:bullet; - mso-level-text:/F0B7; mso-level-tab-stop:.5in; mso-level-number-position:left; text-indent:-.25in; mso-ansi-font-size:10.0pt; font-family:Symbol;} +@list l4:level2 + {mso-level-tab-stop:1.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l4:level3 + {mso-level-tab-stop:1.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l4:level4 + {mso-level-tab-stop:2.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l4:level5 + {mso-level-tab-stop:2.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l4:level6 + {mso-level-tab-stop:3.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l4:level7 + {mso-level-tab-stop:3.5in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l4:level8 + {mso-level-tab-stop:4.0in; + mso-level-number-position:left; + text-indent:-.25in;} +@list l4:level9 + {mso-level-tab-stop:4.5in; + mso-level-number-position:left; + text-indent:-.25in;} ol {margin-bottom:0in;} ul {margin-bottom:0in;} --> </style> +<!--[if gte mso 10]> +<style> + /* Style Definitions */ + table.MsoNormalTable + {mso-style-name:"Table Normal"; + mso-tstyle-rowband-size:0; + mso-tstyle-colband-size:0; + mso-style-noshow:yes; + mso-style-priority:99; + mso-style-parent:""; + mso-padding-alt:0in 5.4pt 0in 5.4pt; + mso-para-margin:0in; + mso-para-margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:10.0pt; + font-family:"Times New Roman","serif";} +</style> +<![endif]--><!--[if gte mso 9]><xml> + <o:shapedefaults v:ext="edit" spidmax="1026"/> +</xml><![endif]--><!--[if gte mso 9]><xml> + <o:shapelayout v:ext="edit"> + <o:idmap v:ext="edit" data="1"/> + </o:shapelayout></xml><![endif]--> </head> <body lang=EN-US link=blue vlink=blue style='tab-interval:.5in'> -<div class=Section1> +<div class=WordSection1> -<table border=0 cellspacing=0 cellpadding=0 width="100%" style='width:100.0%; - mso-cellspacing:0in;mso-padding-alt:0in 0in 0in 0in'> - <tr> +<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width="100%" + style='width:100.0%;mso-cellspacing:0in;mso-yfti-tbllook:1184;mso-padding-alt: + 0in 0in 0in 0in'> + <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'> <td width="9%" nowrap style='width:9.0%;padding:0in 0in 0in 0in'> - <p class=MsoNormal align=center style='text-align:center'><b><a - href="http://www.nscl.msu.edu"><span style='text-decoration:none;text-underline: - none'><img border=0 width=63 height=52 id="_x0000_i1025" - src="../images/nscl_logo_small.gif" alt="nscl_logo_small.gif (2463 bytes)"></span></a><o:p></o:p></b></p> + <p class=MsoNormal align=center style='text-align:center'><a + href="http://www.nscl.msu.edu/"><b style='mso-bidi-font-weight:normal'><span + style='mso-no-proof:yes;text-decoration:none;text-underline:none'><img + border=0 width=63 height=52 id="_x0000_i1028" + src="../images/nscl_logo_small.gif" alt="nscl_logo_small.gif (2463 bytes)"></span></b></a><b><o:p></o:p></b></p> </td> <td width="79%" style='width:79.0%;padding:0in 0in 0in 0in'> - <h1>spectrum - SpecTcl Command</h1> + <h1><span class=GramE><span style='mso-fareast-font-family:"Times New Roman"'>spectrum</span></span><span + style='mso-fareast-font-family:"Times New Roman"'> - SpecTcl Command<o:p></o:p></span></h1> </td> <td width="12%" style='width:12.0%;padding:0in 0in 0in 0in'> - <p class=MsoNormal><a href="../index.htm"><span style='text-decoration:none; - text-underline:none'><img border=0 width=192 height=84 id="_x0000_i1026" - src="../images/hh00706_.jpg" alt="HH00706_.wmf (6530 bytes)"></span></a></p> + <p class=MsoNormal><a href="../index.htm"><span style='mso-no-proof:yes; + text-decoration:none;text-underline:none'><img border=0 width=192 height=84 + id="_x0000_i1027" src="../images/hh00706_.jpg" alt="HH00706_.wmf (6530 bytes)"></span></a></p> </td> </tr> </table> @@ -217,86 +1206,107 @@ and Installing</span><span style='mso-bookmark:Top'></span></a><span style='mso-bookmark:Top'></span></p> -<h2><span style='mso-bookmark:Top'>Syntax</span></h2> +<h2><span style='mso-bookmark:Top'><span style='mso-fareast-font-family:"Times New Roman"'>Syntax<o:p></o:p></span></span></h2> -<p><span style='mso-bookmark:Top'>spectrum [-new] <em>name type parameter-list -axis-speclist </em>[<em>datatype</em>]<br> -spectrum -list [-byid] [-showgate] [pattern]<br> -spectrum -list [-showgate] <em>name</em><br> -spectrum -list -id [-showgate] <em>id</em><i><br> +<p><span style='mso-bookmark:Top'><span class=GramE>spectrum</span> [-new] <em>name +type parameter-list axis-<span class=SpellE>speclist</span> </em>[<span +class=SpellE><em>datatype</em></span>]<br> +spectrum -list [-<span class=SpellE>byid</span>] [-<span class=SpellE>showgate</span>] +[pattern]<br> +spectrum -list [-<span class=SpellE>showgate</span>] <em>name</em><br> +spectrum -list -id [-<span class=SpellE>showgate</span>] <em>id</em><i><br> </i>spectrum -delete <em>name </em>[<em>name...</em>]<br> spectrum -delete <em>id </em>[<em>id...</em>]<br> -spectrum -delete -all <br /> -spectrum -trace {add | delete} <em>script</em> -</span> -</p> -<h2><span style='mso-bookmark:Top'>Synopsis</span></h2> +spectrum -delete -all <br> +spectrum -trace {add | delete} <em>script</em> </span></p> +<h2><span style='mso-bookmark:Top'><span style='mso-fareast-font-family:"Times New Roman"'>Synopsis<o:p></o:p></span></span></h2> + <p><span style='mso-bookmark:Top'>Creates, lists properties of and deletes spectra.</span></p> <ul type=disc> <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; - mso-list:l0 level1 lfo3;tab-stops:list .5in'><span style='mso-bookmark: + mso-list:l0 level1 lfo2;tab-stops:list .5in'><span style='mso-bookmark: Top'>-new will return empty string or reason that the histogram could not be created.</span></li> <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; - mso-list:l0 level1 lfo3;tab-stops:list .5in'><span style='mso-bookmark: + mso-list:l0 level1 lfo2;tab-stops:list .5in'><span style='mso-bookmark: Top'>-list will return the set of histograms listed (or the error reason - if histograms could not be listed). This is a list containing a sublist - for each spectrum. Each spectrum sublist contains in order the Id, the - name, dimensionality, list of parameters, and list of resolutions.</span></li> + if histograms could not be listed). This is a list containing a <span + class=SpellE>sublist</span> for each spectrum. Each spectrum <span + class=SpellE>sublist</span> contains in order the Id, the name, + dimensionality, list of parameters, and list of resolutions.</span></li> <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; - mso-list:l0 level1 lfo3;tab-stops:list .5in'><span style='mso-bookmark: + mso-list:l0 level1 lfo2;tab-stops:list .5in'><span style='mso-bookmark: Top'>-delete will return either a null string or the list of spectra which could not be deleted. For each spectrum a list containing the spectrum name or id and the reason it could not be deleted.</span></li> - <li>-trace allows you to set list or delete a script that is executed when - spectra are added or deleted from SpecTcl.</li> </ul> +<ul type=disc> + <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; + mso-list:l3 level1 lfo1;tab-stops:list .5in'><span style='mso-bookmark: + Top'>-trace allows you to set list or delete a script that is executed + when spectra are added or deleted from SpecTcl.</span></li> +</ul> + <p><span style='mso-bookmark:Top'></span><a href="#Top"><span style='mso-bookmark: Top'>Top</span><span style='mso-bookmark:Top'></span></a><span style='mso-bookmark:Top'></span></p> -<h2><span style='mso-bookmark:Top'>Detailed Description</span></h2> +<h2><span style='mso-bookmark... [truncated message content] |