Accout for acceptance with mu_estimator when simulating & temporarily…

… remove priors for annotating

flamedisx/likelihood.py

@@ -284,7 +284,7 @@ def set_data(self,
                 continue
 
             # Copy ensures annotations don't clobber
-            source.set_data(deepcopy(data[dname]), data_is_annotated)
+            source.set_data(deepcopy(data[dname]), data_is_annotated,ignore_priors=True)
 
             # Update batch info
             dset_index = self.dsetnames.index(dname)
@@ -355,6 +355,10 @@ def simulate(self, fix_truth=None, **params):
             mu = rm * s.mu_before_efficiencies(
                 **self._filter_source_kwargs(params, sname))
             # Simulate this many events from source
+            if type(self.sources[sname]).__name__!='TemplateSource':
+                #only do for non-template sources
+                mu=mu/self.mu_estimators[sname](**self._filter_source_kwargs(params, sname))
+
             n_to_sim = np.random.poisson(mu)
             if n_to_sim == 0:
                 continue