Skip to content

Commit 9a42fad

Browse files
author
Youssef El Mard Bouziani
committed
Resolve rebase conflict in Pi0EtaToGammaGamma.h
1 parent 8b00868 commit 9a42fad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -851,8 +851,8 @@ struct Pi0EtaToGammaGamma {
851851
used_dileptonIds_per_col.emplace_back(tuple_tmp_id2);
852852
}
853853
ndiphoton++;
854-
} // end of dielectron loop
855-
} // end of g1 loop
854+
} // end of dielectron loop
855+
} // end of g1 loop
856856
} else { // PCM-PCM, EMC-EMC, PHOS-PHOS, PCM-EMC and PCM-PHOS.
857857
auto photons1_per_collision = photons1.sliceByCached(TDetectorTag1::perCollision(), collision.globalIndex(), cache);
858858
auto photons2_per_collision = photons2.sliceByCached(TDetectorTag2::perCollision(), collision.globalIndex(), cache);
@@ -932,7 +932,7 @@ struct Pi0EtaToGammaGamma {
932932
}
933933
ndiphoton++;
934934
} // end of pairing loop
935-
} // end of pairing in same event
935+
} // end of pairing in same event
936936

937937
used_photonIds_per_col.clear();
938938
used_photonIds_per_col.shrink_to_fit();

0 commit comments

Comments
 (0)