Skip to content

Commit bc8f1ab

Browse files
whaeckwhaeck
committed
Merge branch '12-correct-some-issue-revealed-by-reading-in-all-endf-8-1-neutron-incident-data' into 'develop'
Resolve "Correct some issue revealed by reading in all endf 8,1 neutron incident data" See merge request njoy/dryad!151
2 parents a1ef551 + 685b8a8 commit bc8f1ab

File tree

10 files changed

+104
-52
lines changed

10 files changed

+104
-52
lines changed

‎python/test/dryad/resonances/Test_CompoundSystem.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def verify_chunk( self, chunk ) :
188188
# spin group 1, channel 2: proton emission
189189
# - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
190190

191-
channel2 = channels[2]
191+
channel2 = channels[3]
192192
self.assertEqual( ChannelID( "n,Cl35->p,S35{1,1,1-}" ), channel2.identifier )
193193
self.assertEqual( False, channel2.is_incident_channel )
194194

@@ -211,7 +211,7 @@ def verify_chunk( self, chunk ) :
211211
# spin group 1, channel 3: elastic
212212
# - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
213213

214-
channel3 = channels[3]
214+
channel3 = channels[2]
215215
self.assertEqual( ChannelID( "n,Cl35->n,Cl35{1,2,1-}" ), channel3.identifier )
216216
self.assertEqual( True, channel3.is_incident_channel )
217217

@@ -426,7 +426,7 @@ def verify_chunk( self, chunk ) :
426426
# spin group 3, channel 2: proton emission
427427
# - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
428428

429-
channel2 = channels[2]
429+
channel2 = channels[3]
430430
self.assertEqual( ChannelID( "n,Cl35->p,S35{1,1,2-}" ), channel2.identifier )
431431
self.assertEqual( False, channel2.is_incident_channel )
432432

@@ -449,7 +449,7 @@ def verify_chunk( self, chunk ) :
449449
# spin group 3, channel 3: elastic
450450
# - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
451451

452-
channel3 = channels[3]
452+
channel3 = channels[2]
453453
self.assertEqual( ChannelID( "n,Cl35->n,Cl35{1,2,2-}" ), channel3.identifier )
454454
self.assertEqual( True, channel3.is_incident_channel )
455455

@@ -505,8 +505,8 @@ def verify_chunk( self, chunk ) :
505505
resonances = table.reduced_width_amplitudes
506506
self.assertAlmostEqual( 32, resonances[0][0] )
507507
self.assertAlmostEqual( 33, resonances[1][0] )
508-
self.assertAlmostEqual( 34, resonances[2][0] )
509-
self.assertAlmostEqual( 35, resonances[3][0] )
508+
self.assertAlmostEqual( 34, resonances[3][0] )
509+
self.assertAlmostEqual( 35, resonances[2][0] )
510510
self.assertAlmostEqual( 36, resonances[4][0] )
511511

512512
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

‎src/njoy/dryad/format/endf/resonances/lrf7/createSpinGroups.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ namespace lrf7 {
5757

5858
// add each to the final channel data, keep it sorted and consolidate duplicate channels
5959
for ( auto&& channel : data ) {
60-
6160
auto iter = std::lower_bound( channel_data.begin(), channel_data.end(),
6261
channel.first.identifier(),
6362
[] ( auto&& left, auto&& right )

‎src/njoy/dryad/id/ChannelID.hpp‎

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ namespace id {
106106
* @param[in] right the id on the right
107107
*/
108108
friend auto operator==( const ChannelID& left, const ChannelID& right ) {
109-
110109
return std::tie( left.quantumNumbers(), left.reaction(), left.partial() ) ==
111110
std::tie( right.quantumNumbers(), right.reaction(), right.partial() );
112111
}
@@ -129,9 +128,56 @@ namespace id {
129128
* @param[in] right the id on the right
130129
*/
131130
friend auto operator<( const ChannelID& left, const ChannelID& right ) {
132-
133-
return std::tie( left.quantumNumbers(), left.reaction(), left.partial() ) <
134-
std::tie( right.quantumNumbers(), right.reaction(), right.partial() );
131+
auto leftQNum = left.quantumNumbers();
132+
auto rightQNum = right.quantumNumbers();
133+
134+
// Test order:
135+
// J, parity, reationID, l, s, partial
136+
if ( leftQNum.totalAngularMomentum() < rightQNum.totalAngularMomentum() )
137+
{
138+
return true;
139+
}
140+
else if ( leftQNum.totalAngularMomentum() > rightQNum.totalAngularMomentum() )
141+
{
142+
return false;
143+
}
144+
145+
if ( leftQNum.parity() < rightQNum.parity() )
146+
{
147+
return true;
148+
}
149+
else if ( leftQNum.parity() > rightQNum.parity() )
150+
{
151+
return false;
152+
}
153+
154+
if ( left.reaction() < right.reaction() )
155+
{
156+
return true;
157+
}
158+
else if ( left.reaction() > right.reaction() )
159+
{
160+
return false;
161+
}
162+
163+
if ( left.quantumNumbers() < right.quantumNumbers() )
164+
{
165+
return true;
166+
}
167+
else if ( left.quantumNumbers() > right.quantumNumbers() )
168+
{
169+
return false;
170+
}
171+
172+
if ( left.partial() < right.partial() )
173+
{
174+
return true;
175+
}
176+
177+
return false;
178+
179+
//return std::tie( left.quantumNumbers(), left.reaction(), left.partial() ) <
180+
// std::tie( right.quantumNumbers(), right.reaction(), right.partial() );
135181
}
136182

137183
/**

‎src/njoy/dryad/id/ReactionType.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,10 @@ namespace id {
13071307
if ( this->interactionType() == InteractionType::Nuclear ) {
13081308

13091309
int za = projectile.za() + target.za() - entries[ this->index_ ].dza().value();
1310+
if (za == 1)
1311+
{
1312+
return ParticleID::neutron();
1313+
}
13101314
return ParticleID::nuclide( za, this->level().value() );
13111315
}
13121316
else {

‎src/njoy/dryad/resonances/HardSpherePenetrability/src/generateFunction.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ static PolynomialSeriesRatio generateFunction( unsigned int l ) {
1010
case 2 : return { { 0, 0, 0, 0, 0, 1 }, { 9, 0, 3, 0, 1 } };
1111
case 3 : return { { 0, 0, 0, 0, 0, 0, 0, 1 }, { 225, 0, 45, 0, 6, 0, 1 } };
1212
case 4 : return { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, { 11025, 0, 1575, 0, 135, 0, 10, 0, 1 } };
13+
case 5: return { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, { 893025, 0, 99225, 0, 6300, 0, 315, 0, 15, 0, 1 } };
1314
default : {
1415

15-
Log::error( "Cannot handle wave functions with l above 4, got \'{}\', "
16+
Log::error( "Cannot handle wave functions with l above 5, got \'{}\', "
1617
"contact dryad developers", l );
1718
throw std::exception();
1819
}

‎src/njoy/dryad/resonances/HardSpherePhaseShift/src/generateFunction.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ generateFunction( unsigned int l ) {
1111
case 2 : return { { 0, 3 }, { 3, 0, -1 } };
1212
case 3 : return { { 0, 15, 0, -1 }, { 15, 0, -6 } };
1313
case 4 : return { { 0, 105, 0, -10 }, { 105, 0, -45, 0, 1 } };
14+
case 5 : return { { 0, 945, 0, -105, 0, 1 }, { 945, 0, -420, 0, 15 } };
1415
default : {
1516

16-
Log::error( "Cannot handle wave functions with l above 4, got \'{}\', "
17+
Log::error( "Cannot handle wave functions with l above 5, got \'{}\', "
1718
"contact dryad developers", l );
1819
throw std::exception();
1920
}

‎src/njoy/dryad/resonances/HardSphereShiftFactor/src/generateFunction.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ static PolynomialSeriesRatio generateFunction( unsigned int l ) {
1010
case 2 : return { { -18, 0, -3 }, { 9, 0, 3, 0, 1 } };
1111
case 3 : return { { -675, 0, -90, 0, -6 }, { 225, 0, 45, 0, 6, 0, 1 } };
1212
case 4 : return { { -44100, 0, -4725, 0, -270, 0, -10 }, { 11025, 0, 1575, 0, 135, 0, 10, 0, 1 } };
13+
case 5: return { { -4465125, 0, -396900, 0, -18900, 0, -630, 0, -15 }, { 893025, 0, 99225, 0, 6300, 0, 315, 0, 15, 0, 1 } };
1314
default : {
1415

15-
Log::error( "Cannot handle wave functions with l above 4, got \'{}\', "
16+
Log::error( "Cannot handle wave functions with l above 5, got \'{}\', "
1617
"contact dryad developers", l );
1718
throw std::exception();
1819
}

‎test/dryad/format/endf/resonances/lrf7/createCompoundSystem.test.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,10 +1649,10 @@ void verifyChunkCl35( const CompoundSystem& chunk ) {
16491649
CHECK( Kinematics::NonRelativistic == channel1.kinematicsType() );
16501650

16511651
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
1652-
// spin group 1, channel 2: proton emission
1652+
// spin group 1, channel 3: proton emission
16531653
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
16541654

1655-
auto channel2 = channels[2];
1655+
auto channel2 = channels[3];
16561656
CHECK( id::ChannelID( "n,Cl35->p,S35{1,1,1-}" ) == channel2.identifier() );
16571657
CHECK( false == channel2.isIncidentChannel() );
16581658

@@ -1678,10 +1678,10 @@ void verifyChunkCl35( const CompoundSystem& chunk ) {
16781678
CHECK( Kinematics::NonRelativistic == channel2.kinematicsType() );
16791679

16801680
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
1681-
// spin group 1, channel 3: elastic
1681+
// spin group 1, channel 2: elastic
16821682
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
16831683

1684-
auto channel3 = channels[3];
1684+
auto channel3 = channels[2];
16851685
CHECK( id::ChannelID( "n,Cl35->n,Cl35{1,2,1-}" ) == channel3.identifier() );
16861686
CHECK( true == channel3.isIncidentChannel() );
16871687

@@ -1752,10 +1752,10 @@ void verifyChunkCl35( const CompoundSystem& chunk ) {
17521752
CHECK_THAT( std::sqrt( 0.860 / 2. ), WithinRel( resonances[0][55] ) );
17531753
CHECK_THAT( std::sqrt( .628 / 2. / channel1.penetrability( 4.250762e+3 ) ), WithinRel( resonances[1][0] ) );
17541754
CHECK_THAT( std::sqrt( 5.365630e+3 / 2. / channel1.penetrability( 1.435502e+6 ) ), WithinRel( resonances[1][55] ) );
1755-
CHECK_THAT( std::sqrt( .23 / 2. / channel2.penetrability( 4.250762e+3 ) ), WithinRel( resonances[2][0] ) );
1756-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.435502e+6 ) ), WithinRel( resonances[2][55] ) );
1757-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 4.250762e+3 ) ), WithinRel( resonances[3][0] ) );
1758-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 1.435502e+6 ) ), WithinRel( resonances[3][55] ) );
1755+
CHECK_THAT( std::sqrt( .23 / 2. / channel2.penetrability( 4.250762e+3 ) ), WithinRel( resonances[3][0] ) );
1756+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.435502e+6 ) ), WithinRel( resonances[3][55] ) );
1757+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 4.250762e+3 ) ), WithinRel( resonances[2][0] ) );
1758+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 1.435502e+6 ) ), WithinRel( resonances[2][55] ) );
17591759
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( 4.250762e+3 ) ), WithinRel( resonances[4][0] ) );
17601760
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( 1.435502e+6 ) ), WithinRel( resonances[4][55] ) );
17611761

@@ -1945,10 +1945,10 @@ void verifyChunkCl35( const CompoundSystem& chunk ) {
19451945
CHECK( Kinematics::NonRelativistic == channel1.kinematicsType() );
19461946

19471947
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
1948-
// spin group 3, channel 2: proton emission
1948+
// spin group 3, channel 3: proton emission
19491949
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
19501950

1951-
channel2 = channels[2];
1951+
channel2 = channels[3];
19521952
CHECK( id::ChannelID( "n,Cl35->p,S35{1,1,2-}" ) == channel2.identifier() );
19531953
CHECK( false == channel2.isIncidentChannel() );
19541954

@@ -1974,10 +1974,10 @@ void verifyChunkCl35( const CompoundSystem& chunk ) {
19741974
CHECK( Kinematics::NonRelativistic == channel2.kinematicsType() );
19751975

19761976
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
1977-
// spin group 3, channel 3: elastic
1977+
// spin group 3, channel 2: elastic
19781978
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
19791979

1980-
channel3 = channels[3];
1980+
channel3 = channels[2];
19811981
CHECK( id::ChannelID( "n,Cl35->n,Cl35{1,2,2-}" ) == channel3.identifier() );
19821982
CHECK( true == channel3.isIncidentChannel() );
19831983

@@ -2048,10 +2048,10 @@ void verifyChunkCl35( const CompoundSystem& chunk ) {
20482048
CHECK_THAT( std::sqrt( 0.860 / 2. ), WithinRel( resonances[0][94] ) );
20492049
CHECK_THAT( std::sqrt( 3.820180e+4 / 2. / channel1.penetrability( -3.369334e+5 ) ), WithinRel( resonances[1][0] ) );
20502050
CHECK_THAT( std::sqrt( 0.0 / 2. / channel1.penetrability( 1.441365e+6 ) ), WithinRel( resonances[1][94] ) );
2051-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( -3.369334e+5 ) ), WithinRel( resonances[2][0] ) );
2052-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.441365e+6 ) ), WithinRel( resonances[2][94] ) );
2053-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( -3.369334e+5 ) ), WithinRel( resonances[3][0] ) );
2054-
CHECK_THAT( std::sqrt( 1.608740e+3 / 2. / channel3.penetrability( 1.441365e+6 ) ), WithinRel( resonances[3][94] ) );
2051+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( -3.369334e+5 ) ), WithinRel( resonances[3][0] ) );
2052+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.441365e+6 ) ), WithinRel( resonances[3][94] ) );
2053+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( -3.369334e+5 ) ), WithinRel( resonances[2][0] ) );
2054+
CHECK_THAT( std::sqrt( 1.608740e+3 / 2. / channel3.penetrability( 1.441365e+6 ) ), WithinRel( resonances[2][94] ) );
20552055
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( -3.369334e+5 ) ), WithinRel( resonances[4][0] ) );
20562056
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( 1.441365e+6 ) ), WithinRel( resonances[4][94] ) );
20572057

‎test/dryad/format/endf/resonances/lrf7/createSpinGroups.test.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -883,10 +883,10 @@ void verifyChunkCl35( const std::vector< SpinGroup >& chunk ) {
883883
CHECK( Kinematics::NonRelativistic == channel1.kinematicsType() );
884884

885885
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
886-
// spin group 1, channel 2: proton emission
886+
// spin group 1, channel 3: proton emission
887887
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
888888

889-
auto channel2 = channels[2];
889+
auto channel2 = channels[3];
890890
CHECK( id::ChannelID( "n,Cl35->p,S35{1,1,1-}" ) == channel2.identifier() );
891891
CHECK( false == channel2.isIncidentChannel() );
892892

@@ -912,10 +912,10 @@ void verifyChunkCl35( const std::vector< SpinGroup >& chunk ) {
912912
CHECK( Kinematics::NonRelativistic == channel2.kinematicsType() );
913913

914914
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
915-
// spin group 1, channel 3: elastic
915+
// spin group 1, channel 2: elastic
916916
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
917917

918-
auto channel3 = channels[3];
918+
auto channel3 = channels[2];
919919
CHECK( id::ChannelID( "n,Cl35->n,Cl35{1,2,1-}" ) == channel3.identifier() );
920920
CHECK( true == channel3.isIncidentChannel() );
921921

@@ -986,10 +986,10 @@ void verifyChunkCl35( const std::vector< SpinGroup >& chunk ) {
986986
CHECK_THAT( std::sqrt( 0.860 / 2. ), WithinRel( resonances[0][55] ) );
987987
CHECK_THAT( std::sqrt( .628 / 2. / channel1.penetrability( 4.250762e+3 ) ), WithinRel( resonances[1][0] ) );
988988
CHECK_THAT( std::sqrt( 5.365630e+3 / 2. / channel1.penetrability( 1.435502e+6 ) ), WithinRel( resonances[1][55] ) );
989-
CHECK_THAT( std::sqrt( .23 / 2. / channel2.penetrability( 4.250762e+3 ) ), WithinRel( resonances[2][0] ) );
990-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.435502e+6 ) ), WithinRel( resonances[2][55] ) );
991-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 4.250762e+3 ) ), WithinRel( resonances[3][0] ) );
992-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 1.435502e+6 ) ), WithinRel( resonances[3][55] ) );
989+
CHECK_THAT( std::sqrt( .23 / 2. / channel2.penetrability( 4.250762e+3 ) ), WithinRel( resonances[3][0] ) );
990+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.435502e+6 ) ), WithinRel( resonances[3][55] ) );
991+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 4.250762e+3 ) ), WithinRel( resonances[2][0] ) );
992+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( 1.435502e+6 ) ), WithinRel( resonances[2][55] ) );
993993
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( 4.250762e+3 ) ), WithinRel( resonances[4][0] ) );
994994
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( 1.435502e+6 ) ), WithinRel( resonances[4][55] ) );
995995

@@ -1183,10 +1183,10 @@ void verifyChunkCl35( const std::vector< SpinGroup >& chunk ) {
11831183
CHECK( Kinematics::NonRelativistic == channel1.kinematicsType() );
11841184

11851185
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
1186-
// spin group 3, channel 2: proton emission
1186+
// spin group 3, channel 3: proton emission
11871187
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
11881188

1189-
channel2 = channels[2];
1189+
channel2 = channels[3];
11901190
CHECK( id::ChannelID( "n,Cl35->p,S35{1,1,2-}" ) == channel2.identifier() );
11911191
CHECK( false == channel2.isIncidentChannel() );
11921192

@@ -1212,10 +1212,10 @@ void verifyChunkCl35( const std::vector< SpinGroup >& chunk ) {
12121212
CHECK( Kinematics::NonRelativistic == channel2.kinematicsType() );
12131213

12141214
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
1215-
// spin group 3, channel 3: elastic
1215+
// spin group 3, channel 2: elastic
12161216
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
12171217

1218-
channel3 = channels[3];
1218+
channel3 = channels[2];
12191219
CHECK( id::ChannelID( "n,Cl35->n,Cl35{1,2,2-}" ) == channel3.identifier() );
12201220
CHECK( true == channel3.isIncidentChannel() );
12211221

@@ -1286,10 +1286,10 @@ void verifyChunkCl35( const std::vector< SpinGroup >& chunk ) {
12861286
CHECK_THAT( std::sqrt( 0.860 / 2. ), WithinRel( resonances[0][94] ) );
12871287
CHECK_THAT( std::sqrt( 3.820180e+4 / 2. / channel1.penetrability( -3.369334e+5 ) ), WithinRel( resonances[1][0] ) );
12881288
CHECK_THAT( std::sqrt( 0.0 / 2. / channel1.penetrability( 1.441365e+6 ) ), WithinRel( resonances[1][94] ) );
1289-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( -3.369334e+5 ) ), WithinRel( resonances[2][0] ) );
1290-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.441365e+6 ) ), WithinRel( resonances[2][94] ) );
1291-
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( -3.369334e+5 ) ), WithinRel( resonances[3][0] ) );
1292-
CHECK_THAT( std::sqrt( 1.608740e+3 / 2. / channel3.penetrability( 1.441365e+6 ) ), WithinRel( resonances[3][94] ) );
1289+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( -3.369334e+5 ) ), WithinRel( resonances[3][0] ) );
1290+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel2.penetrability( 1.441365e+6 ) ), WithinRel( resonances[3][94] ) );
1291+
CHECK_THAT( std::sqrt( 0.0 / 2. / channel3.penetrability( -3.369334e+5 ) ), WithinRel( resonances[2][0] ) );
1292+
CHECK_THAT( std::sqrt( 1.608740e+3 / 2. / channel3.penetrability( 1.441365e+6 ) ), WithinRel( resonances[2][94] ) );
12931293
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( -3.369334e+5 ) ), WithinRel( resonances[4][0] ) );
12941294
CHECK_THAT( std::sqrt( 0.0 / 2. / channel4.penetrability( 1.441365e+6 ) ), WithinRel( resonances[4][94] ) );
12951295

‎test/dryad/resonances/CompoundSystem.test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ void verifyChunk( const CompoundSystem& chunk ) {
413413
// spin group 1, channel 2: proton emission
414414
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
415415

416-
auto channel2 = channels[2];
416+
auto channel2 = channels[3];
417417
CHECK( id::ChannelID( "n,Cl35->p,S35{1,1,1-}" ) == channel2.identifier() );
418418
CHECK( false == channel2.isIncidentChannel() );
419419

@@ -439,7 +439,7 @@ void verifyChunk( const CompoundSystem& chunk ) {
439439
// spin group 1, channel 3: elastic
440440
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
441441

442-
auto channel3 = channels[3];
442+
auto channel3 = channels[2];
443443
CHECK( id::ChannelID( "n,Cl35->n,Cl35{1,2,1-}" ) == channel3.identifier() );
444444
CHECK( true == channel3.isIncidentChannel() );
445445

@@ -675,7 +675,7 @@ void verifyChunk( const CompoundSystem& chunk ) {
675675
// spin group 3, channel 2: proton emission
676676
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
677677

678-
channel2 = channels[2];
678+
channel2 = channels[3];
679679
CHECK( id::ChannelID( "n,Cl35->p,S35{1,1,2-}" ) == channel2.identifier() );
680680
CHECK( false == channel2.isIncidentChannel() );
681681

@@ -701,7 +701,7 @@ void verifyChunk( const CompoundSystem& chunk ) {
701701
// spin group 3, channel 3: elastic
702702
// - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
703703

704-
channel3 = channels[3];
704+
channel3 = channels[2];
705705
CHECK( id::ChannelID( "n,Cl35->n,Cl35{1,2,2-}" ) == channel3.identifier() );
706706
CHECK( true == channel3.isIncidentChannel() );
707707

@@ -763,8 +763,8 @@ void verifyChunk( const CompoundSystem& chunk ) {
763763
resonances = table.reducedWidthAmplitudes();
764764
CHECK_THAT( 32, WithinRel( resonances[0][0] ) );
765765
CHECK_THAT( 33, WithinRel( resonances[1][0] ) );
766-
CHECK_THAT( 34, WithinRel( resonances[2][0] ) );
767-
CHECK_THAT( 35, WithinRel( resonances[3][0] ) );
766+
CHECK_THAT( 34, WithinRel( resonances[3][0] ) );
767+
CHECK_THAT( 35, WithinRel( resonances[2][0] ) );
768768
CHECK_THAT( 36, WithinRel( resonances[4][0] ) );
769769

770770
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

0 commit comments

Comments
 (0)