Skip to content

Commit 115e8fc

Browse files
committed
fix hydra::unweight
1 parent fc70e6f commit 115e8fc

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

hydra/detail/Decays.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public:
8585

8686
hydra_thrust::uniform_real_distribution<double> uniDist(0.0,1.0);
8787

88-
return ( weight/fMaxWeight >= uniDist(randEng)) ;
88+
return ( weight/fMaxWeight > uniDist(randEng)) ;
8989
}
9090

9191
__hydra_host__ __hydra_device__
@@ -474,7 +474,7 @@ typedef hydra_thrust::transform_iterator<reweight_functor,iterator> reweight_ite
474474
typedef detail::FlagDaugthers< reweight_functor> tagger_type;
475475

476476
//number of events to trial
477-
size_t ntrials = this->size();
477+
size_t ntrials = fDecays.size();
478478

479479
//create iterators
480480
hydra_thrust::counting_iterator < size_t > first(0);

hydra/detail/Random.inl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ template< typename RNG, typename IteratorData, typename IteratorWeight>
8484
typename std::enable_if<
8585
detail::random::is_iterator<IteratorData>::value && detail::random::is_iterator<IteratorWeight>::value,
8686
Range<IteratorData> >::type
87-
unweight(IteratorData data_begin, IteratorData data_end , IteratorData weights_begin)
87+
unweight(IteratorData data_begin, IteratorData data_end , IteratorWeight weights_begin)
8888
{
8989
using hydra_thrust::system::detail::generic::select_system;
9090
typedef typename hydra_thrust::iterator_system<IteratorData>::type system_data_type;
@@ -138,8 +138,7 @@ unweight(hydra_thrust::detail::execution_policy_base<DerivedPolicy> const& poli
138138

139139
typedef typename Functor::return_type value_type;
140140

141-
typedef hydra_thrust::pointer<value_type,
142-
typename hydra_thrust::detail::execution_policy_base<DerivedPolicy>::tag_type> pointer_type;
141+
typedef hydra_thrust::pointer<value_type,DerivedPolicy> pointer_type;
143142

144143
typedef detail::RndFlag<value_type,pointer_type, RNG > flagger_type;
145144

0 commit comments

Comments
 (0)