Skip to content

N_gen set to sum weights #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mashephe merged 2 commits into from
Sep 3, 2026
Merged

N_gen set to sum weights #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0af4568
collection of modifications to use the sum of the weights of the gene…
Sep 3, 2026
90d52a4
use long int instead of int when writing out number of generated events
Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions AmpTools/IUAmpTools/NormIntInterface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ NormIntInterface::~NormIntInterface(){
istream&
NormIntInterface::loadNormIntCache( istream& input )
{
input >> m_nGenEvents >> m_sumAccWeights;
input >> m_sumGenWeights >> m_sumAccWeights;

int numTerms;
input >> numTerms;
Expand Down Expand Up @@ -191,7 +191,7 @@ NormIntInterface::operator+=( const NormIntInterface& nii )
double nGenEvts = nii.numGenEvents();

double totalAccEvts = nAccEvts + m_sumAccWeights;
double totalGenEvts = nGenEvts + m_nGenEvents;
double totalGenEvts = nGenEvts + m_sumGenWeights;

string ampName, conjAmpName;

Expand All @@ -212,8 +212,8 @@ NormIntInterface::operator+=( const NormIntInterface& nii )
m_ampIntCache[2*i*n+j+1] /= totalAccEvts;


m_ampIntCache[2*i*n+j] *= m_nGenEvents;
m_ampIntCache[2*i*n+j+1] *= m_nGenEvents;
m_ampIntCache[2*i*n+j] *= m_sumGenWeights;
m_ampIntCache[2*i*n+j+1] *= m_sumGenWeights;

complex< double > ni = nii.normInt( m_termNames[i], m_termNames[j] );

Expand All @@ -228,7 +228,7 @@ NormIntInterface::operator+=( const NormIntInterface& nii )


m_sumAccWeights = totalAccEvts;
m_nGenEvents = totalGenEvts;
m_sumGenWeights = totalGenEvts;

m_emptyNormIntCache = false;
m_emptyAmpIntCache = false;
Expand Down Expand Up @@ -280,7 +280,7 @@ NormIntInterface::normInt( string amp, string conjAmp, bool forceUseCache ) cons
report( DEBUG, kModule ) << "Request for normInt ( " << amp << ", " << conjAmp
<< " ) asking IntensityManager to calculate integrals." << endl;

m_pIntenManager->calcIntegrals( m_accMCVecs, m_nGenEvents );
m_pIntenManager->calcIntegrals( m_accMCVecs, m_sumGenWeights );
setNormIntMatrix( m_accMCVecs.m_pdIntegralMatrix );
}
#endif
Expand Down Expand Up @@ -373,7 +373,7 @@ NormIntInterface::forceCacheUpdate( bool normIntOnly ) const
report( DEBUG, kModule ) << "Asking IntensityManager to update integrals "
<< "using the accepted MC." << endl;

m_pIntenManager->calcIntegrals( m_accMCVecs, m_nGenEvents );
m_pIntenManager->calcIntegrals( m_accMCVecs, m_sumGenWeights );
setNormIntMatrix( m_accMCVecs.m_pdIntegralMatrix );

m_emptyNormIntCache = false;
Expand Down Expand Up @@ -402,7 +402,7 @@ NormIntInterface::forceCacheUpdate( bool normIntOnly ) const
report( DEBUG, kModule ) << "Asking IntensityManager to calculate integrals "
<< "using the generated MC." << endl;

m_pIntenManager->calcIntegrals( m_genMCVecs, m_nGenEvents, m_chunkSize );
m_pIntenManager->calcIntegrals( m_genMCVecs, m_sumGenWeights, m_chunkSize );

setAmpIntMatrix( m_genMCVecs.m_pdIntegralMatrix );

Expand All @@ -427,7 +427,7 @@ NormIntInterface::forceCacheUpdate( bool normIntOnly ) const
}
else {

m_pIntenManager->calcIntegrals( m_accMCVecs, m_nGenEvents );
m_pIntenManager->calcIntegrals( m_accMCVecs, m_sumGenWeights );
setNormIntMatrix( m_accMCVecs.m_pdIntegralMatrix );
}
m_emptyNormIntCache = false;
Expand All @@ -451,7 +451,11 @@ NormIntInterface::exportNormIntCache( ostream& out ) const
if( m_emptyNormIntCache || m_emptyAmpIntCache ) forceCacheUpdate();
#endif

out << m_nGenEvents << "\t" << m_sumAccWeights << endl;
// the static cast produces an output file that is backwards compatible
// with older versions that used integer number of generated events
// rather than the sum of the weights -- this should not make any
// signficant difference in a result
out << static_cast<long int>(m_sumGenWeights) << "\t" << m_sumAccWeights << endl;

out << m_termNames.size() << endl;

Expand Down Expand Up @@ -596,7 +600,7 @@ NormIntInterface::loadMC() const {

genVecs->second->shareDataWith( &m_genMCVecs, m_pIntenManager->needsUserVarsOnly() );
}
m_nGenEvents = m_genMCVecs.m_iNTrueEvents;
m_sumGenWeights = m_genMCVecs.m_dSumWeights;
}

void
Expand Down
6 changes: 3 additions & 3 deletions AmpTools/IUAmpTools/NormIntInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class NormIntInterface
istream& loadNormIntCache( istream& in );
void operator+=( const NormIntInterface& nii );

size_t numGenEvents() const { return m_nGenEvents; }
double numGenEvents() const { return m_sumGenWeights; }
double numAccEvents() const { return m_sumAccWeights; }

// this integral folds in detector acceptance
Expand Down Expand Up @@ -103,7 +103,7 @@ class NormIntInterface
const double* ampIntMatrix() const { return m_ampIntCache; }
const double* normIntMatrix() const { return m_normIntCache; }

void setGenEvents( size_t events ) { m_nGenEvents = events; }
void setGenEvents( double sumWeights ) { m_sumGenWeights = sumWeights; }
void setAccEvents( double sumWeights ) { m_sumAccWeights = sumWeights; }

protected:
Expand Down Expand Up @@ -135,7 +135,7 @@ class NormIntInterface
mutable bool m_emptyNormIntCache;
mutable bool m_emptyAmpIntCache;

mutable size_t m_nGenEvents;
mutable double m_sumGenWeights;
mutable double m_sumAccWeights;

#ifndef __ACLIC__
Expand Down
26 changes: 12 additions & 14 deletions AmpTools/IUAmpToolsMPI/NormIntInterfaceMPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,35 +95,34 @@ NormIntInterfaceMPI::setupMPI()

m_isLeader = ( m_rank == 0 );

long int totalGenEvents = 0;
double totalGenWeights = 0;
double totalAccWeights = 0;

if( m_isLeader ){

for( int i = 1; i < m_numProc; ++i ){

size_t thisEvents;
double thisWeights;

// trigger sending of events from followers -- data is irrelevant
MPI_Send( &thisEvents, 1, MPI_LONG, i, MPITag::kAcknowledge,
MPI_Send( &thisWeights, 1, MPI_DOUBLE, i, MPITag::kAcknowledge,
MPI_COMM_WORLD );
Comment thread
mashephe marked this conversation as resolved.

// now receive actual data
MPI_Recv( &thisEvents, 1, MPI_LONG, i, MPITag::kIntSend,
MPI_Recv( &thisWeights, 1, MPI_DOUBLE, i, MPITag::kDoubleSend,
MPI_COMM_WORLD, &status );
totalGenEvents += thisEvents;
totalGenWeights += thisWeights;

MPI_Recv( &thisWeights, 1, MPI_DOUBLE, i, MPITag::kDoubleSend,
MPI_COMM_WORLD, &status );
totalAccWeights += thisWeights;

// send acknowledgment
MPI_Send( &thisEvents, 1, MPI_LONG, i, MPITag::kAcknowledge,
MPI_Send( &thisWeights, 1, MPI_DOUBLE, i, MPITag::kAcknowledge,
MPI_COMM_WORLD );
Comment on lines 120 to 122
}

setGenEvents( totalGenEvents );
setGenEvents( totalGenWeights );
setAccEvents( totalAccWeights );
}
else{
Expand All @@ -134,7 +133,6 @@ NormIntInterfaceMPI::setupMPI()
// usage on the lead node
loadMC();

long int thisEvents;
double thisWeights;

// if we are not the leader, send generated and accepted events
Expand All @@ -145,16 +143,16 @@ NormIntInterfaceMPI::setupMPI()
// to signal that it is ready to accept numbers of events

// data is irrelevant for this receive
MPI_Recv( &thisEvents, 1, MPI_LONG, 0, MPITag::kAcknowledge, MPI_COMM_WORLD,
MPI_Recv( &thisWeights, 1, MPI_DOUBLE, 0, MPITag::kAcknowledge, MPI_COMM_WORLD,
&status );

thisEvents = numGenEvents();
MPI_Send( &thisEvents, 1, MPI_LONG, 0, MPITag::kIntSend, MPI_COMM_WORLD );
thisWeights = numGenEvents();
MPI_Send( &thisWeights, 1, MPI_DOUBLE, 0, MPITag::kDoubleSend, MPI_COMM_WORLD );

thisWeights = numAccEvents();
MPI_Send( &thisWeights, 1, MPI_DOUBLE, 0, MPITag::kDoubleSend, MPI_COMM_WORLD );

MPI_Recv( &thisEvents, 1, MPI_LONG, 0, MPITag::kAcknowledge, MPI_COMM_WORLD,
MPI_Recv( &thisWeights, 1, MPI_DOUBLE, 0, MPITag::kAcknowledge, MPI_COMM_WORLD,
&status );
}
}
Expand Down Expand Up @@ -185,8 +183,8 @@ NormIntInterfaceMPI::sumIntegrals( IntType type ) const

// now broadcast the total number of events from the leader to the
// followers so that they may renormalize the sum properly
long int totalEvents = numGenEvents();
MPI_Bcast( &totalEvents, 1, MPI_LONG, 0, MPI_COMM_WORLD );
double totalEvents = numGenEvents();
MPI_Bcast( &totalEvents, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD );

// and renormalize the sum
for( int i = 0; i < cacheSize(); ++i ) result[i] /= totalEvents;
Comment thread
mashephe marked this conversation as resolved.
Expand Down
Loading