File tree Expand file tree Collapse file tree 3 files changed +8
-7
lines changed Expand file tree Collapse file tree 3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 28
28
#include < map>
29
29
#include < set>
30
30
#include < mutex>
31
+ #include < chrono>
32
+ #include < memory>
31
33
#include < string>
32
34
#include < vector>
33
35
#include < algorithm>
34
36
#include < functional>
35
- #include < memory>
36
37
37
38
/*
38
- Shortcommings that wcjohns should address:
39
+ Shortcomings that wcjohns should address:
39
40
- Many of the N24 fields possible are not checked for
40
41
- comments for multiple different tags, ...
41
42
- Neutron counts are typically merged into a gamma detectors Measurement if a
@@ -64,7 +65,7 @@ Shortcommings that wcjohns should address:
64
65
I'm not sure if the derived spectra should be in with the rest of the spectra
65
66
- When multiple copies of data is included in file with different energy
66
67
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
68
69
"_intercal_<calid>" to its name; should impose a better mechanism to handle
69
70
this.
70
71
- the generated UUID should maybe be more stable with respect to just the
Original file line number Diff line number Diff line change @@ -271,9 +271,9 @@ bool SpecFile::load_from_phd( std::istream &input )
271
271
measurements_.push_back ( meas );
272
272
273
273
cleanup_after_load ();
274
- }catch ( std::exception &e )
274
+ }catch ( std::exception & )
275
275
{
276
- cerr << " caught: " << e.what () << endl;
276
+ // cerr << "caught: " << e.what() << endl;
277
277
reset ();
278
278
input.clear ();
279
279
input.seekg ( orig_pos, ios::beg );
Original file line number Diff line number Diff line change @@ -1516,7 +1516,7 @@ bool SpecFile::load_from_iaea( std::istream& istr )
1516
1516
if ( skip_getline )
1517
1517
continue ;
1518
1518
1519
- assert ( line == " 0.000" );
1519
+ // assert( ( line == "0.000") || (line == "20.000") );
1520
1520
if ( line != " 0.000" )
1521
1521
parse_warnings_.push_back ( " Unexpected third line value in neutron section: '" + line + " ', expected '0.000'." );
1522
1522
@@ -1528,7 +1528,7 @@ bool SpecFile::load_from_iaea( std::istream& istr )
1528
1528
if ( skip_getline )
1529
1529
continue ;
1530
1530
1531
- assert ( line == " 1.000" || line == " 0.000" );
1531
+ // assert( line == "1.000" || line == "0.000" );
1532
1532
if ( (line != " 1.000" ) && (line != " 0.000" ) )
1533
1533
parse_warnings_.push_back ( " Unexpected fourth line value in neutron section: '" + line + " ', expected '0.000' or '1.000'." );
1534
1534
You can’t perform that action at this time.
0 commit comments