Add additional pdf information to aid with refactoring (scikit-hep#305)

* add additional pdf information in preparation for megachannel

Author: kratsg

.ackrc

@@ -0,0 +1,2 @@
+--ignore-directory=docs/_generated
+--ignore-directory=htmlcov

pyhf/pdf.py

@@ -10,46 +10,47 @@
 
 
 class _ModelConfig(object):
-    @classmethod
-    def from_spec(cls,spec,poiname = 'mu', qualify_names = False):
-        channels = []
-        samples = []
-        modifiers = []
+    def __init__(self, spec, poiname = 'mu', qualify_names = False):
+        self.poi_index = None
+        self.par_map = {}
+        self.par_order = []
+        self.auxdata = []
+        self.auxdata_order = []
+        self.next_index = 0
+
+        self.channels = []
+        self.samples = []
+        self.parameters = []
+        self.modifiers = []
+        self.channel_nbins = {}
         # hacky, need to keep track in which order we added the constraints
         # so that we can generate correctly-ordered data
-        instance = cls()
         for channel in spec['channels']:
-            channels.append(channel['name'])
+            self.channels.append(channel['name'])
+            self.channel_nbins[channel['name']] = len(channel['samples'][0]['data'])
             for sample in channel['samples']:
-                samples.append(sample['name'])
+                self.samples.append(sample['name'])
                 # we need to bookkeep a list of modifiers by type so that we
                 # can loop over them on a type-by-type basis
                 # types like histosys, normsys, etc...
                 sample['modifiers_by_type'] = {}
                 for modifier_def in sample['modifiers']:
+                    self.parameters.append(modifier_def['name'])
                     if qualify_names:
                         fullname = '{}/{}'.format(modifier_def['type'],modifier_def['name'])
                         if modifier_def['name'] == poiname:
                             poiname = fullname
                         modifier_def['name'] = fullname
-                    modifier = instance.add_or_get_modifier(channel, sample, modifier_def)
+                    modifier = self.add_or_get_modifier(channel, sample, modifier_def)
                     modifier.add_sample(channel, sample, modifier_def)
-                    modifiers.append(modifier_def['name'])
+                    self.modifiers.append(modifier_def['name'])
                     sample['modifiers_by_type'].setdefault(modifier_def['type'],[]).append(modifier_def['name'])
-        instance.channels = list(set(channels))
-        instance.samples = list(set(samples))
-        instance.modifiers = list(set(modifiers))
-        instance.set_poi(poiname)
-        return instance
-
-    def __init__(self):
-        # set up all other bookkeeping variables
-        self.poi_index = None
-        self.par_map = {}
-        self.par_order = []
-        self.auxdata = []
-        self.auxdata_order = []
-        self.next_index = 0
+        self.channels = list(set(self.channels))
+        self.samples = list(set(self.samples))
+        self.parameters = list(set(self.parameters))
+        self.modifiers = list(set(self.modifiers))
+        self.channel_nbins = self.channel_nbins
+        self.set_poi(poiname)
 
     def suggested_init(self):
         init = []
@@ -135,13 +136,12 @@ def add_or_get_modifier(self, channel, sample, modifier_def):
 class Model(object):
     def __init__(self, spec, **config_kwargs):
         self.spec = copy.deepcopy(spec) #may get modified by config
-        self.schema = config_kwargs.get('schema', utils.get_default_schema())
+        self.schema = config_kwargs.pop('schema', utils.get_default_schema())
         # run jsonschema validation of input specification against the (provided) schema
         log.info("Validating spec against schema: {0:s}".format(self.schema))
         utils.validate(self.spec, self.schema)
         # build up our representation of the specification
-        self.config = _ModelConfig.from_spec(self.spec,**config_kwargs)
-
+        self.config = _ModelConfig(self.spec, **config_kwargs)
 
         for m in self.config.modifiers:
             mod = self.config.modifier(m)

tests/test_pdf.py

@@ -257,7 +257,7 @@ def test_invalid_modifier():
         ]
     }
     with pytest.raises(pyhf.exceptions.InvalidModifier):
-        pyhf.pdf._ModelConfig.from_spec(spec)
+        pyhf.pdf._ModelConfig(spec)
 
 
 def test_invalid_modifier_name_resuse():