Skip to content

Commit

Permalink
Merge pull request #124 from ehb54/alexey-dev-issue331
Browse files Browse the repository at this point in the history
Utils: analysis profile: comparison operator: supress the check for a…
  • Loading branch information
demeler authored Aug 10, 2024
2 parents 47ec1da + 05542cd commit 3c229c3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
9 changes: 9 additions & 0 deletions programs/us_analysis_profile/us_analysis_profile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@ DbgLv(1) << "MAIN: CALL check_runname()";
DbgLv(1) << "MAIN: CALL reset()";
//reset();
resize( 500, 450 );

// //test
// US_AnaProfile profile1;
// US_AnaProfile profile2;

// if ( profile1 == profile2 )
// qDebug() << "ana profs EQUAL";
// else
// qDebug() << "ana profs NOT EQUAL";
}


Expand Down
10 changes: 9 additions & 1 deletion utils/us_ana_profile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,22 @@ bool US_AnaProfile::operator== ( const US_AnaProfile& ap ) const
if ( aprofGUID != ap.aprofGUID ) return false;
if ( protoname != ap.protoname ) return false;
if ( protoGUID != ap.protoGUID ) return false;
if ( nchan != ap.nchan ) return false;

qDebug() << "[ANA comp] Gen1 OK";

qDebug() << "nchan: " << nchan << ap.nchan;
//if ( nchan != ap.nchan ) return false;

qDebug() << "[ANA comp] Gen2 OK";

if ( lc_ratios != ap.lc_ratios ) return false;
if ( lc_tolers != ap.lc_tolers ) return false;
if ( l_volumes != ap.l_volumes ) return false;
if ( lv_tolers != ap.lv_tolers ) return false;
if ( data_ends != ap.data_ends ) return false;

qDebug() << "[ANA comp] Gen3 OK";

//abde
if ( ld_dens_0s != ap.ld_dens_0s ) return false;
if ( gm_vbars != ap.gm_vbars ) return false;
Expand Down

0 comments on commit 3c229c3

Please sign in to comment.