forked from cms-sw/cmssw
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
First commit of the L1TZDC folder, skeleton under L1Trigger, modeled …
…after L1TCalorimeter Updated naming scheme to remove Stage2 in the ZDC producer - also added contact info and dates in event of bugs/history issues Stripped out everything except for digis in and etsums out Removed a few leftover items causing compile failure from last stripdown of superfluous elements - need to fix the BuildFile.xml still Added I think the only include statement needed for QIE10DataFrame Added a test file l1ZDCProducerTest.py based on GM work here: https://github.com/ginnocen/UPCopenHFanalysis/tree/zdc_calibrationcode/zdc_calibration/newZDCAnalyzer/test Initial copy of L1TStage2CaloAnlyzer to L1TZDCAnalyzer, just renaming the class, no internal changes (next commit attempt to strip down to etsums only) Updated to a working producer that outputs dummy etsums and an analyzers that compiles, building a simple ttree for etsums per event - next step is to get the python running interfacing producer with analyzer, and replacing dummy et sums Fixed both the L1TZDCAnalyzer for not filling the TTree, moved ET in names to Et, and fixed issues in the l1ZDCProducerTest python for not picking up the ETSums Forgot to remove the bx checks from the last push in L1ZDCAnalyzer - remove for now but be ready to revert if this is important to L1 folks Fixed two small errors in the L1TZDCAnalyzer and L1TZDCProducer, and added a README w/ build instructions under L1Trigger/L1TZDC Fixed mistake in README Updated the L1TZDCAnalyzer, Producer, and ProducerTest.py files under L1TZDC via ginnocen edits that can be found here: ginnocen@1554043 + the previous commit; in future we will try to switch to doing this properly by pull requests Last build was successful which means we can increment to v0.1.0. Version up because working version with ZDCEtSum output, non-dummy. Next increment to v0.2.0 with lookup tables instead of hard-coded LUT and compatibility with CMSSW_13_2_0_pre3. Also modified README to reflect the latest build First pass at adding ZDC LUT handling to CaloParamsHelper.h, L1TCaloStage2ParamsESProducer.cc, and caloParams_cfi.py Updated for the changes ginnocen made in this commit ginnocen@5b8bc71 along with updated README instructions to tag v0.1.3 this will corresppond to - again, need to switch to proper PR system over linking git commits hack Updated DataFormats/L1TGlobal/*/GlobalObject.* files for gtZDCP and gtZDCM - also updated the ZDC Producer to match the P/M convention for Plus/Minus rather than our existing choice of P/N for Positive/Negative Fixed bug in l1ZDCProducerTest.py (left input as zdcEtSumsN instead of zdcEtSumsM, change to match convention), updated EtSum for kZDCP and kZDCM, updated L1TZDCProducer to use this new type, and readme to use this tag=zdcL1T_v0.1.5 Updating the L1TNtuples for a temp ZDCP and ZDCM etSums (not using the enum position of this etsum but rather as independent objects for speedy implementation Modified caloParams so the LUTFile isnt empty and updated the README for latest build instructions getting the ZDCSums into the L1TNtuple Large update to the ZDCProducer replacing hard-coded lut w/ py lut (toggleable for now); Analyzer fix (all bx except 4 off, plus N -> M in ZDC naming convention); createLUT for flattened file; l1ZDCProducerTest and a data dir for the python luts under L1TZDC Small fixes for LUT + reduced bx from 10 to 5 (centered on bx 4, position of peak, for 2, 3, 4, 5, 6 in zdc output) - Analyzer nBX reduced to 5 (hardcoded), also LUT in caloParams now points to what we pull in under L1Trigger/L1TZDC/data - this is the set of changes for incrementing to v0.2.0 Updated README file to fix readability and add some common debug info Still fixing README Updated README for more info that was missing in build + fixed a bunch of typos Updated README for git tag zdcL1T_latest to avoid future need for README updates Collapsed ZDCP and ZDCM outputs of the L1TZDCProducer into a single ETSum; P and M now distinguished by kZDCP and kZDCM EtSum type id defined in the data format - also altered the test L1TZDCAnalyzer and the l1ZDCProducerTest.py file, checked the outputs looked unchanged when running with this update Mass update for Upgrade tree and update to README for clearer instructions + modified for combining ZDC EtSums into one object Commit after testing of zdcL1T branch for PR; tested on 2023.08.22 w/ CMSSW_13_3_x_2023-08-22-1100 i.e. latest daily. Two tests fail but inspecting log shows files were not accessible (even after double checking voms was done) - will request advice on PR Updated files per initial comments on PR here: https://github.com/cms-sw/cmssw/pull/42634/files ; also attempted to fix in additional places as yet uncommented with similar issues Fixes for code format issues flagged in git cmssw bot checks on last commit; just ran scram build code-format on the command line Modifications for PR; mostly removal of comments no longer relevant, removal of functions not relevant, switching from cout to LogInfo, and switching to unique_ptr for handling caloParamsHelper Removed unused iterator called counter from Producer, and changed a cout to edm::LogInfo inAnalyzer Merging in PR from elfontan, cms-sw#42635, handling of the uGT side of the ZDC trigger; ran scram runtests, codechecks and code format before push; some change to L1TZDC code to fix residual differences between prs Fix from @elfontan for Zdc ESum Condition replacing existing ESum Condition - now passes test in testL1TGlobalProducer.sh - also added requested protections for L1TZDCProducer - check if input is valid and if no, output empty collection with a warning
- Loading branch information
Showing
39 changed files
with
1,859 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,6 +43,8 @@ namespace l1t { | |
| gtCentrality6, | ||
| gtCentrality7, | ||
| gtExternal, | ||
| gtZDCP, | ||
| gtZDCM, | ||
| ObjNull | ||
| }; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,6 +52,8 @@ namespace l1t { | |
| kAsymHt, | ||
| kAsymEtHF, | ||
| kAsymHtHF, | ||
| kZDCP, | ||
| kZDCM, | ||
| kUninitialized | ||
| }; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| #ifndef L1Trigger_L1TGlobal_ZdcEnergySumCondition_h | ||
| #define L1Trigger_L1TGlobal_ZdcEnergySumCondition_h | ||
|
|
||
| /** | ||
| * \class ZdcEnergySumCondition | ||
| * | ||
| * | ||
| * Description: evaluation of a CondZdcEnergySum condition. | ||
| * | ||
| * Implementation: | ||
| * <TODO: enter implementation details> | ||
| * | ||
| * \author: Vasile Mihai Ghete - HEPHY Vienna | ||
| * | ||
| * | ||
| */ | ||
|
|
||
| // system include files | ||
| #include <iosfwd> | ||
| #include <string> | ||
|
|
||
| // user include files | ||
| // base classes | ||
| #include "L1Trigger/L1TGlobal/interface/ConditionEvaluation.h" | ||
|
|
||
| // forward declarations | ||
| class GlobalCondition; | ||
| class ZdcEnergySumTemplate; | ||
|
|
||
| namespace l1t { | ||
|
|
||
| class L1Candidate; | ||
|
|
||
| class GlobalBoard; | ||
|
|
||
| // class declaration | ||
| class ZdcEnergySumCondition : public ConditionEvaluation { | ||
| public: | ||
| /// constructors | ||
| /// default | ||
| ZdcEnergySumCondition(); | ||
|
|
||
| /// from base template condition (from event setup usually) | ||
| ZdcEnergySumCondition(const GlobalCondition*, const GlobalBoard*); | ||
|
|
||
| // copy constructor | ||
| ZdcEnergySumCondition(const ZdcEnergySumCondition&); | ||
|
|
||
| // destructor | ||
| ~ZdcEnergySumCondition() override; | ||
|
|
||
| // assign operator | ||
| ZdcEnergySumCondition& operator=(const ZdcEnergySumCondition&); | ||
|
|
||
| public: | ||
| /// the core function to check if the condition matches | ||
| const bool evaluateCondition(const int bxEval) const override; | ||
|
|
||
| /// print condition | ||
| void print(std::ostream& myCout) const override; | ||
|
|
||
| public: | ||
| /// get / set the pointer to a L1GtCondition | ||
| inline const ZdcEnergySumTemplate* gtZdcEnergySumTemplate() const { return m_gtZdcEnergySumTemplate; } | ||
|
|
||
| void setGtZdcEnergySumTemplate(const ZdcEnergySumTemplate*); | ||
|
|
||
| /// get / set the pointer to uGt GlobalBoard | ||
| inline const GlobalBoard* getuGtB() const { return m_uGtB; } | ||
|
|
||
| void setuGtB(const GlobalBoard*); | ||
|
|
||
| private: | ||
| /// copy function for copy constructor and operator= | ||
| void copy(const ZdcEnergySumCondition& cp); | ||
|
|
||
| private: | ||
| /// pointer to a ZdcEnergySumTemplate | ||
| const ZdcEnergySumTemplate* m_gtZdcEnergySumTemplate; | ||
|
|
||
| /// pointer to uGt GlobalBoard, to be able to get the trigger objects | ||
| const GlobalBoard* m_uGtB; | ||
| }; | ||
|
|
||
| } // namespace l1t | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| #ifndef L1Trigger_L1TGlobal_ZdcEnergySumTemplate_h | ||
| #define L1Trigger_L1TGlobal_ZdcEnergySumTemplate_h | ||
|
|
||
| /** | ||
| * \class ZdcEnergySumTemplate | ||
| * | ||
| * | ||
| * Description: L1 Global Trigger energy-sum template. | ||
| * | ||
| * Implementation: | ||
| * <TODO: enter implementation details> | ||
| * | ||
| * \author: Vasile Mihai Ghete - HEPHY Vienna | ||
| * | ||
| * $Date$ | ||
| * $Revision$ | ||
| * | ||
| */ | ||
|
|
||
| // system include files | ||
| #include <string> | ||
| #include <iosfwd> | ||
|
|
||
| // user include files | ||
|
|
||
| // base class | ||
| #include "L1Trigger/L1TGlobal/interface/GlobalCondition.h" | ||
|
|
||
| // forward declarations | ||
|
|
||
| // class declaration | ||
| class ZdcEnergySumTemplate : public GlobalCondition { | ||
| public: | ||
| // constructor | ||
| ZdcEnergySumTemplate(); | ||
|
|
||
| // constructor | ||
| ZdcEnergySumTemplate(const std::string&); | ||
|
|
||
| // constructor | ||
| ZdcEnergySumTemplate(const std::string&, const l1t::GtConditionType&); | ||
|
|
||
| // copy constructor | ||
| ZdcEnergySumTemplate(const ZdcEnergySumTemplate&); | ||
|
|
||
| // destructor | ||
| ~ZdcEnergySumTemplate() override; | ||
|
|
||
| // assign operator | ||
| ZdcEnergySumTemplate& operator=(const ZdcEnergySumTemplate&); | ||
|
|
||
| public: | ||
| struct ObjectParameter { | ||
| unsigned int etLowThreshold; | ||
| unsigned int etHighThreshold; | ||
| }; | ||
|
|
||
| public: | ||
| inline const std::vector<ObjectParameter>* objectParameter() const { return &m_objectParameter; } | ||
|
|
||
| /// set functions | ||
| void setConditionParameter(const std::vector<ObjectParameter>&); | ||
|
|
||
| /// print the condition | ||
| void print(std::ostream& myCout) const override; | ||
|
|
||
| /// output stream operator | ||
| friend std::ostream& operator<<(std::ostream&, const ZdcEnergySumTemplate&); | ||
|
|
||
| private: | ||
| /// copy function for copy constructor and operator= | ||
| void copy(const ZdcEnergySumTemplate& cp); | ||
|
|
||
| private: | ||
| /// variables containing the parameters | ||
| std::vector<ObjectParameter> m_objectParameter; | ||
| }; | ||
|
|
||
| #endif |
Oops, something went wrong.