[Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl:[1574]
trunk/SpecTcl

Revision: 1574
http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1574&view=rev
Author: ron-fox
Date: 2008-12-30 21:25:55 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
- Good compiles on base part of gamma summary spectrum addition.
- Opportunistic comment header trimming.
Modified Paths:
--------------
trunk/SpecTcl/Sorter/CGammaSummarySpectrum.cpp
trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp
trunk/SpecTcl/TCL/TCLList.h
Modified: trunk/SpecTcl/Sorter/CGammaSummarySpectrum.cpp
===================================================================
--- trunk/SpecTcl/Sorter/CGammaSummarySpectrum.cpp 2008-12-30 21:25:16 UTC (rev 1573)
+++ trunk/SpecTcl/Sorter/CGammaSummarySpectrum.cpp 2008-12-30 21:25:55 UTC (rev 1574)
@@ -123,9 +123,14 @@
nYChannels,
fYLow, fYHigh);
}
-
/*!
+ Destructor is here for chaining:
+*/
+template <class T>
+CGammaSummarySpectrum<T>::~CGammaSummarySpectrum() {}
+
+/*!
Increment the spectrum. Iterating through each x channel and its associated
axis mapping, treat that x channel strip as a 1-d spectrum and increment
it.
Modified: trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp
===================================================================
--- trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp 2008-12-30 21:25:16 UTC (rev 1573)
+++ trunk/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp 2008-12-30 21:25:55 UTC (rev 1574)
@@ -44,55 +44,9 @@
//
//
//////////////////////////.cpp file/////////////////////////////////////////////////////
-/*
- Change Log:
- $Log$
- Revision 5.6 2007/09/11 21:06:33 ron-fox
- Put the correct spectrum axis limits into swrite files.
- Revision 5.5 2007/05/11 20:51:57 ron-fox
- Make NSCLAsciiSpectrumFormatter correctly deal with rev 2, 3 and
- 'malforme3d 2' produced by version 3.2-pre2 for summary spectra.
- Revision 5.4 2007/05/11 15:30:53 ron-fox
- Change spectrum I/O format version to 3. Need to figure out how to read 2
- for e.g. summary spectra.
- Revision 5.3 2007/02/23 20:38:18 ron-fox
- BZ291 enhancement... add gamma deluxe spectrum type (independent x/y
- parameter lists).
-
- Revision 5.2 2005/06/03 15:19:29 ron-fox
- Part of breaking off /merging branch to start 3.1 development
-
- Revision 5.1.2.2 2005/05/11 21:26:37 ron-fox
- - Add -pedantic and deal with the fallout.
- - Fix long standing issues with sread/swrite -format binary
- - Merge in Tim's strip chart spectrum and ensure stuff builds
- correctly.
-
- Revision 5.1.2.1 2004/12/21 17:51:26 ron-fox
- Port to gcc 3.x compilers.
-
- Revision 5.1 2004/11/29 16:56:13 ron-fox
- Begin port to 3.x compilers calling this 3.0
-
- Revision 4.6.4.1 2004/07/01 13:54:42 ron-fox
- Defect 135: swrite does not properly preserve channel -> spectrum mappings.
-
- Revision 4.6 2003/11/13 19:48:49 ron-fox
- Unconditionally include config.h
-
- Revision 4.5 2003/08/25 16:25:33 ron-fox
- Initial starting point for merge with filtering -- this probably does not
- generate a goo spectcl build.
-
- Revision 4.4 2003/04/19 00:11:50 ron-fox
- Move to format version 2.0: Supply mapping information about the range covered by each axis of a spectrum. Note that reads are backwards compatible with version 1.0 and will default the range to 0 - nchans-1.
-
-*/
-
-
#include <config.h>
#include "NSCLAsciiSpectrumFormatter.h"
@@ -271,42 +225,82 @@
vector<Float_t> createHighs;
vector<UInt_t> createDims;
- if(eSpecType == keSummary) {
- UInt_t nChannels;
- if (nRevision == 3) {
- nChannels = vDimensions[0];
- }
- else {
- // There was a time that I had not incremented the
- // rev level to 2, but wrote only 1 dim:
- if (vDimensions.size() == 1) {
+ // This switch handles special cases:
+
+ switch (eSpecType) {
+
+ case keSummary:
+ {
+
+ UInt_t nChannels;
+ if (nRevision == 3) {
nChannels = vDimensions[0];
- } else {
- nChannels = vDimensions[1];
}
+ else {
+ // There was a time that I had not incremented the
+ // rev level to 2, but wrote only 1 dim:
+
+ if (vDimensions.size() == 1) {
+ nChannels = vDimensions[0];
+ } else {
+ nChannels = vDimensions[1];
+ }
+ }
+ Float_t fLow = vLows[1];
+ Float_t fHigh = vHighs[1];
+
+ createDims.push_back(nChannels);
+ createLows.push_back(fLow);
+ createHighs.push_back(fHigh);
+
}
- Float_t fLow = vLows[1];
- Float_t fHigh = vHighs[1];
-
- createDims.push_back(nChannels);
- createLows.push_back(fLow);
- createHighs.push_back(fHigh);
-
+ break;
+ default:
+ {
+
+ createDims = vDimensions;
+ createLows = vLows;
+ createHighs= vHighs;
+ }
}
- else {
- createDims = vDimensions;
- createLows = vLows;
- createHighs= vHighs;
- }
//
// Create an appropriate spectrum:
//
CSpectrum* pSpectrum(0);
CSpectrumFactory Factory;
Factory.ExceptionMode(kfFALSE);
- if (vyParameters.size() == 0) {
+
+ // Gamma summary spectra are a special case:
+
+ if (eSpecType == keGSummary) {
+ // parameter names have to be marshalled into a vector of vectors.
+ // each parameter strip ends in an empty parameter name ("").
+ // This includes the last strip.
+
+ vector<vector<string> > gSummaryParams;
+ vector<string> column;
+ for (int i=0; i < vParameters.size(); i++) {
+ if (vParameters[i] == "") {
+ // End of strip:
+
+ gSummaryParams.push_back(column);
+ column.clear();
+ }
+ else {
+ column.push_back(vParameters[i]);
+ }
+ }
+ // Now we can create the spectrum:
+
pSpectrum = Factory.CreateSpectrum(Name, eSpecType, eDataType,
+ gSummaryParams,
+ createDims, &createLows, &createHighs);
+
+
+ }
+ else if (vyParameters.size() == 0) {
+ pSpectrum = Factory.CreateSpectrum(Name, eSpecType, eDataType,
vParameters,
createDims,
&createLows,
@@ -325,7 +319,8 @@
// Once more a wierdness of summary spectra.. at this time
// vDimensions won't be right for them:
- if (eSpecType == keSummary) {
+ if ((eSpecType == keSummary) ||
+ (eSpecType == keGSummary)) {
vDimensions.clear();
vDimensions.push_back(vParameters.size()); // X axis dim is parameter count.
vDimensions.push_back(createDims[0]); // and y axis is the 1 creation dim.
@@ -424,7 +419,8 @@
rStream << ") "; // Close off the first one:
Delimeter = '(';
for (UInt_t i = 0; i < spectrumDef.vyParameters.size(); i++) {
- FindById p(spectrumDef.vyParameters[i]);
+ UInt_t pnum = spectrumDef.vyParameters[i];
+ FindById p(pnum);
ParameterDictionaryIterator i = rDict.FindMatch(p);
string name;
if (i != rDict.end()) {
@@ -441,13 +437,14 @@
else {
Delimeter = '(';
for(UInt_t i = 0; i < Parameters.size(); i++) {
- FindById p(Parameters[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;
}
else {
- rStream << Delimeter << "*UNKNOWN*";
+ rStream << Delimeter << (pnum == UINT_MAX ? Quote+Quote : "*UNKNOWN*");
}
Delimeter = ' ';
}
Modified: trunk/SpecTcl/TCL/TCLList.h
===================================================================
--- trunk/SpecTcl/TCL/TCLList.h 2008-12-30 21:25:16 UTC (rev 1573)
+++ trunk/SpecTcl/TCL/TCLList.h 2008-12-30 21:25:55 UTC (rev 1574)
@@ -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
*/
+
// CTCLList.h:
//
// This file defines the CTCLList class.
@@ -289,46 +28,7 @@
// Copyright 1999 NSCL, All Rights Reserved.
//
/////////////////////////////////////////////////////////////
-/*!
- Change Log:
- $Log$
- Revision 5.3 2006/03/10 14:21:53 ron-fox
- Migrate TCL Interfaces to object form and remove direct
- references to interp->result
- Revision 5.2 2005/06/03 15:19:30 ron-fox
- Part of breaking off /merging branch to start 3.1 development
-
- Revision 5.1.2.1 2004/12/21 17:51:27 ron-fox
- Port to gcc 3.x compilers.
-
- Revision 5.1 2004/11/29 16:56:14 ron-fox
- Begin port to 3.x compilers calling this 3.0
-
- Revision 4.2.4.1 2004/10/20 19:53:02 ron-fox
- Fix a defect discovered in TCLList::operator= attempt to allow variables
- as axis specs (failed).
-
- Revision 4.2 2003/03/25 12:01:28 ron-fox
- Added Change log comment generated from the CVS $Log$
- Added Change log comment generated from the CVS Revision 5.3 2006/03/10 14:21:53 ron-fox
- Added Change log comment generated from the CVS Migrate TCL Interfaces to object form and remove direct
- Added Change log comment generated from the CVS references to interp->result
- Added Change log comment generated from the CVS
- Added Change log comment generated from the CVS Revision 5.2 2005/06/03 15:19:30 ron-fox
- Added Change log comment generated from the CVS Part of breaking off /merging branch to start 3.1 development
- Added Change log comment generated from the CVS
- Added Change log comment generated from the CVS Revision 5.1.2.1 2004/12/21 17:51:27 ron-fox
- Added Change log comment generated from the CVS Port to gcc 3.x compilers.
- Added Change log comment generated from the CVS
- Added Change log comment generated from the CVS Revision 5.1 2004/11/29 16:56:14 ron-fox
- Added Change log comment generated from the CVS Begin port to 3.x compilers calling this 3.0
- Added Change log comment generated from the CVS
- Added Change log comment generated from the CVS Revision 4.2.4.1 2004/10/20 19:53:02 ron-fox
- Added Change log comment generated from the CVS Fix a defect discovered in TCLList::operator= attempt to allow variables
- Added Change log comment generated from the CVS as axis specs (failed).
- Added Change log comment generated from the CVS tag.
-*/
#ifndef __TCLLIST_H //Required for current class
#define __TCLLIST_H
//Required for base classes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.