Skip to content

Commit f5a4233

Browse files
committed
Fix compile issue.
1 parent 6568f94 commit f5a4233

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

SpecUtils/SpecFile.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
#include <map>
2929
#include <set>
3030
#include <mutex>
31+
#include <chrono>
32+
#include <memory>
3133
#include <string>
3234
#include <vector>
3335
#include <algorithm>
3436
#include <functional>
35-
#include <memory>
3637

3738
/*
38-
Shortcommings that wcjohns should address:
39+
Shortcomings that wcjohns should address:
3940
- Many of the N24 fields possible are not checked for
4041
- comments for multiple different tags, ...
4142
- Neutron counts are typically merged into a gamma detectors Measurement if a
@@ -64,7 +65,7 @@ Shortcommings that wcjohns should address:
6465
I'm not sure if the derived spectra should be in with the rest of the spectra
6566
- When multiple copies of data is included in file with different energy
6667
calibrations (different energy ranges, or linear vs log energy scale),
67-
currently denote this by artificaually creating new detector and adding
68+
currently denote this by artificially creating new detector and adding
6869
"_intercal_<calid>" to its name; should impose a better mechanism to handle
6970
this.
7071
- the generated UUID should maybe be more stable with respect to just the

src/SpecFile_phd.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ bool SpecFile::load_from_phd( std::istream &input )
271271
measurements_.push_back( meas );
272272

273273
cleanup_after_load();
274-
}catch( std::exception &e )
274+
}catch( std::exception & )
275275
{
276-
cerr << "caught: " << e.what() << endl;
276+
//cerr << "caught: " << e.what() << endl;
277277
reset();
278278
input.clear();
279279
input.seekg( orig_pos, ios::beg );

src/SpecFile_spe.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ bool SpecFile::load_from_iaea( std::istream& istr )
15161516
if( skip_getline )
15171517
continue;
15181518

1519-
assert( line == "0.000" );
1519+
// assert( (line == "0.000") || (line == "20.000") );
15201520
if( line != "0.000" )
15211521
parse_warnings_.push_back( "Unexpected third line value in neutron section: '" + line + "', expected '0.000'." );
15221522

@@ -1528,7 +1528,7 @@ bool SpecFile::load_from_iaea( std::istream& istr )
15281528
if( skip_getline )
15291529
continue;
15301530

1531-
assert( line == "1.000" || line == "0.000" );
1531+
// assert( line == "1.000" || line == "0.000" );
15321532
if( (line != "1.000") && (line != "0.000") )
15331533
parse_warnings_.push_back( "Unexpected fourth line value in neutron section: '" + line + "', expected '0.000' or '1.000'." );
15341534

0 commit comments

Comments
 (0)