Merge branch 'cms-PdmV:master' into events_skim

cms-PdmV · Sep 10, 2024 · 92967c9 · 92967c9
2 parents 7f91d8f + 7235149
commit 92967c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/core/model/model_base.py b/core/model/model_base.py
@@ -26,7 +26,7 @@ class ModelBase(PdmVModelBase):
         'globaltag': lambda gt: ModelBase.matches_regex(gt, ModelBase.__globaltag_regex),
         'label': lambda label: ModelBase.matches_regex(label, '[a-zA-Z0-9_]{0,75}'),
         'matrix': lambda m: m in ('standard', 'upgrade', 'generator',
-                                  'pileup', 'premix', 'extendedgen', 'gpu'),
+                                  'pileup', 'premix', 'extendedgen', 'gpu', 'data_highstats'),
         'memory': lambda mem: 0 <= mem <= 32000,
         'processing_string': lambda ps: ModelBase.matches_regex(ps, ModelBase.__ps_regex),
         'relval': lambda r: ModelBase.matches_regex(r, ModelBase.__relval_regex),

diff --git a/vue_frontend/src/components/RelValsEdit.vue b/vue_frontend/src/components/RelValsEdit.vue
@@ -44,6 +44,11 @@
               <option>standard</option>
               <option>upgrade</option>
               <option>generator</option>
+              <option>pileup</option>
+              <option>premix</option>
+              <option>extendedgen</option>
+              <option>gpu</option>
+              <option>data_highstats</option>
             </select>
           </td>
         </tr>

diff --git a/vue_frontend/src/components/TicketsEdit.vue b/vue_frontend/src/components/TicketsEdit.vue
@@ -92,6 +92,7 @@
               <option>premix</option>
               <option>extendedgen</option>
               <option>gpu</option>
+              <option>data_highstats</option>
             </select>
           </td>
         </tr>