Update DQMD for L1Calo Phase 1 to better sort the web display and fix efex error

Update the L1Calo dqmd web display to fix efex input not displaying properly and then reorganize trigger efficiency displays, and fix gfex monitoring to use regular expressions

DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config

@@ -100,30 +100,6 @@ output top_level {
         }
       }
     }
-    output Phase1 {
-      output gFexSRJets {
-      }
-      output gFexLRJets {
-      }
-      output gFexMHT {
-      }
-      output gFexMST {
-      }
-      output gFexRHO {
-      }
-      output gFexSumEt {
-      }
-      output gFexSumEtNoiseCut {
-      }
-      output gFexEtRMS {
-      }
-      output gFexXE {
-      }
-      output gFexXENoiseCut {
-      }
-      output gFexXERMS {
-      }
-    }
     output CPM {
       output Errors {
         output Hardware {
@@ -228,26 +204,38 @@ output top_level {
     }
     output ROD {
     }
-    output JetTrigEfficiency {
-      output ${TriggerGeneration} {
-        output ${RefType}ReferenceTrig {
+    output TriggerEfficiency {
+      output JetTrigEff {
+        output ${TriggerGeneration} {
+          output ${RefType}ReferenceTrig {
+          }
         }
       }
-      output MET_Trig_Efficiency {
-        output ${AlgType} {
-        }
+      output METTrigEff {
+      }
+      output ElectronTrigEff {
       }
     }
-    output Phase1InputMonitoring {
-      output ${Phase1Systems}Input {
+    output gFEX {
+      output ${gFexTobType} {
+      }
+      output Input {
+      }
+    }
+    output jFEX {
+      output Input {
       }
     }
     output eFEX {
-      output ${TobType} {
+      output ${eFexTobType} {
         output ${LowHiPt} {
-	}
-      }
+	      }
+      } 
       output Input {
+        output ${eFexInputType} {
+          output ${eFexInputSubFloder} {
+          }
+        }
       }
       output ByteStreamDecoder {
       }
@@ -6156,7 +6144,7 @@ dir L1Calo {
         regex = 1
         hist pt.* {
           regex = 1
-          output = L1Calo/JetTrigEfficiency/${TriggerGeneration}/${RefType}ReferenceTrig
+          output = L1Calo/TriggerEfficiency/JetTrigEff/${TriggerGeneration}/${RefType}ReferenceTrig
           description = Jet trigger efficiency turn on curve as a function of leading offline jet pT
         }
       }
@@ -6164,30 +6152,32 @@ dir L1Calo {
   }
 }
 # # # # # # # # # # # # # # # # # # # # # # #
-# Phase 1 FEX Input Monitoring Histos
+# MET Trigger Efficiency Monitoring Histos
 # # # # # # # # # # # # # # # # # # # # # # #
-dir L1Calo {
-  regex = 1
-  dir (?P<Phase1Systems>Gfex|Jfex)Input {
-    regex = 1
-    hist h_.* {
-      regex = 1
-      output = L1Calo/Phase1InputMonitoring/${Phase1Systems}Input
-      description = Phase 1 FEX input monitoring
-    } 
-  }
-}
+dir HLT {
+  dir METMon {
+    dir Shifter {
+      dir eff {
+        regex = 1
+        hist L1_.* {
+          output = L1Calo/TriggerEfficiency/METTrigEff
+        }
+      }
+    } #end Shifter
+  } #end dir METMon
+} #end dir HLT
+
 # # # # # # # # # # # # # # # # # # # # # # #
 # Phase 1 eFEX Monitoring Histos
 # # # # # # # # # # # # # # # # # # # # # # #
 # TOBs and input data
 dir L1Calo {
   dir Efex {
-    dir (?P<TobType>TOB|TOBcopy|xTOB) {
+    dir (?P<eFexTobType>TOBcopy|TOB|xTOB) {
       regex = 1
       dir (?P<LowHiPt>eEMHiPtCut|eEMLowPtCut|eTauHiPtCut|eTauLowPtCut) {
+        output = L1Calo/eFEX/${eFexTobType}/${LowHiPt}
         hist h_.* {
-          output = L1Calo/eFEX/${TobType}/${LowHiPt}
           description = Phase 1 eFEX TOB monitoring
         }
       }
@@ -6196,114 +6186,72 @@ dir L1Calo {
 }
 dir L1Calo {
   dir EfexInput {
-      hist h_.* {
+    regex = 1
+    dir (?P<eFexInputType>calo.*|fex.*|events|mismatches) {
+      dir (?P<eFexInputSubFloder>fex.*|phi_vs_eta) {
+        hist .* {
+          regex = 1
+          output = L1Calo/eFEX/Input/${eFexInputType}/${eFexInputSubFloder}
+          description = Phase 1 eFEX input monitoring
+        }
+      } #end eFexInputSubFloder
+      hist .* {
         regex = 1
-        output = L1Calo/eFEX/Input
+        output = L1Calo/eFEX/Input/${eFexInputType}
         description = Phase 1 eFEX input monitoring
       }
-  }
-}
+    } #end eFexInputType
+  } #end EfexInput
+} #end L1Calo
+
 # decoding errors at HLT
 dir HLT {
   dir HLTFramework {
     dir L1BSConverters {
-      dir eFexBSDecoderTool {
+      dir L1TriggerByteStreamDecoder {
         output = L1Calo/eFEX/ByteStreamDecoder
-        hist errors {
+        hist *.eFex.* {
         }
       }
     }
   }
 }
+
 # # # # # # # # # # # # # # # # # # # # # # #
-# MET Trigger Efficiency Monitoring Histos
+# Phase 1 jFEX Monitoring Histos
 # # # # # # # # # # # # # # # # # # # # # # #
-dir HLT {
-  dir METMon {
-    dir Shifter {
-      dir (?P<AlgType>L1_.*) {
+#input data
+dir L1Calo {
+  dir JfexInput {
+      hist h_.* {
         regex = 1
-        output = L1Calo/JetTrigEfficiency/MET_Trig_Efficiency/${AlgType}
-        hist L1_.* {
-        }
+        output = L1Calo/jFEX/Input
+        description = Phase 1 jFEX input monitoring
       }
-    } #end Shifter
-  } #end dir METMon
-} #end dir HLT
-
-###################
-# gFEX histograms #
-###################
+  } #end JfexInput 
+} #end L1Calo
 
+# # # # # # # # # # # # # # # # # # # # # # #
+# Phase 1 gFEX Monitoring Histos
+# # # # # # # # # # # # # # # # # # # # # # #
 dir L1Calo {
   dir Gfex {
-    dir gFexSRJets.* {
-      regex = 1
-      output = L1Calo/Phase1/gFexSRJets
-      hist h_.* {
-      }
-    } #end gFexSRJets
-    dir gFexLRJets.* {
-      regex = 1
-      output = L1Calo/Phase1/gFexLRJets
-      hist h_.* {
-      }
-    } #end gFexLRJets
-    dir gMHT {
-      regex = 1
-      output = L1Calo/Phase1/gFexMHT
-      hist h_.* {
-      }
-    } #end gMHT
-    dir gMST {
-      regex = 1
-      output = L1Calo/Phase1/gFexMST
-      hist h_.* {
-      }
-    } #end gMST
-    dir gRHO {
-      regex = 1
-      output = L1Calo/Phase1/gFexRHO
-      hist h_.* {
-      }
-    } #end gRHO
-    dir gTE {
-      regex = 1
-      output = L1Calo/Phase1/gFexSumEt
-      hist h_.* {
-      }
-    } #end gTE
-    dir gTE_NoiseCut {
-      regex = 1
-      output = L1Calo/Phase1/gFexSumEtNoiseCut
-      hist h_.* {
-      }
-    } #end gTE_NoiseCut
-    dir gTE_RMS {
-      regex = 1
-      output = L1Calo/Phase1/gFexEtRMS
-      hist h_.* {
-      }
-    } #end gTE_RMS
-    dir gXE {
-      regex = 1
-      output = L1Calo/Phase1/gFexXE
-      hist h_.* {
-      }
-    } #end gXE
-    dir gXE_NoiseCut {
-      regex = 1
-      output = L1Calo/Phase1/gFexXENoiseCut
-      hist h_.* {
-      }
-    } #end gXE_NoiseCut
-    dir gXE_RMS {
-      regex = 1
-      output = L1Calo/Phase1/gFexXERMS
+    dir (?P<gFexTobType>g.*) {
       hist h_.* {
+        regex = 1
+        output = L1Calo/gFEX/${gFexTobType}
+        description = Phase 1 gFEX TOB monitoring
       }
-    } #end gXE_RMS
+    } #end gFexTobType
   } #end Gfex
+  dir GfexInput {
+    regex = 1
+    hist h_.* {
+      regex = 1
+      output = L1Calo/gFEX/Input
+      description = Phase 1 gFEX input monitoring
+    } 
+  } #end GfexInput
 } #end L1Calo