Skip to content
Snippets Groups Projects
Commit 9c562ded authored by Henric Wilkens's avatar Henric Wilkens
Browse files

Added new variables to h3000 n-tuple 

conde clean up


Former-commit-id: 49abbddf
parent 3ecad1ae
112 merge requests!76035Updated rel21 number,!66713update MadGraph version,!63304adding missing electron iso WPs (Tight_VarRad, Loose_VarRad, TightTrackOnly_VarRad),!62053Merge branch 'sh_xrd_warning' into 'master',!61521fix maxPVrefit,!59663fixed a typo in HIGG8D1 format (followup of https://gitlab.cern.ch/atlas/athena/-/merge_requests/59575),!51680Add functionality to MultiBjetFilter,!50754Return TruthTaus from truth matching tool in SUSY tools,!48850Added new HDBS derivation (HDBS3),!46643Draft:Adding MET Significance in AT,!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!46320Draft: Adding support for Leading3SignalJets strategy,!45689Bug fix: Use wrong vector to calculate largest bin number in findBin(),!45211Update in the FFJetSmearingTool,!45045WIP: Include another condition for hit merging in FCS_StepInfoSD.cxx,!45043Merge branch 'Update-DAOD_IDNCB' into '21.2',!44869Draft: Update to candidate store,!44864Draft: WIP- MuonUncorrelateSystematics,!44215added ART tests,!43718Modification of EXOT17.py for fractionally charged particle search,!42752Fix for TopRecon UserHook,!4217921.9-first_steps-InDetTrackingGeometryXML,!42171Add LAr cell DQ plots to UPC stream,!41097TruthJetFilter phi filter,!40581Fix crash in egamma topocluster decorator,!40342WIP: ATR-22546 - add missing trigger to MC16a,!39592Cherry picking !27086 in 21.0 mc16d (ATLPHYSVAL-705),!39162Draft: Insert BCM' support,!38765Bis78 cabling,!38102Add SameParticleHardScatteringFilter,!37848Add TrigRingerRings to EGAM3, EGAM4 and EGAM9,!37483Fix in monitoring of Pixel FE errors,!36893Fix size of RPC active region in BIS78 and strip material,!36766Truth class fallback max dr,!36648Rivet doc update,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!35816Add HardScatterParticles into the EXOT8 Derivation,!35273Fix JETM1: add back TruthEvents,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!3473421.0 fix dq servers,!34244WIP: 21.2 topq1 add rc jets 2020 06 27,!34182Merge new MCTruthClassifier developments into master,!34164Use allMuons instead oc combinedOnly for BPHY15,!33996WIP: Correct MM zpositions,!33707WIP: Fixes for the updated Powheg Wt_DR process, and removal of Wt_DR_onshellW and Wt_DS_onshellW processes,!33109Add delta-R to nearest VR track jet decoration,!33012Adding Prompt Lepton Improved Veto to TOPQ,!3297121.6 parameter dict pythia fixes,!3291021.3 salva s0,!3288421.0 salva s8,!32637WIP: Add tracks in R=0.4 jets to STDM11,!32353WIP: Fix rare bug in jet smearing RNG seed,!3217421.9 - Bug fix for test stream creation in RD53BEncodingTool,!32173H7 lhe interface,!32051Fix of compilation warnings in CPAnalysisExamples,!31371Add missing copyright headings,!31361WIP: AnalysisTop Update - New Muon Isolation WPs included,!3135321.3,!3134821.9 README Update,!31345Add HEC sampling fractions macros,!31136added also PUsub for LargeR jets,!31123WIP: Master ttmdev,!30796Reducing number of warnings in MuonEfficiencyCorrections when missing dRJet decoration,!3043421.6 mg,!3036121.9 fixing bug with layer indices in PixelRDOAnalysis,!30295Move from boost::filesystem to std::filesystem,!29617IDPerfmonZmumu updates,!29454Idpvm 21.0 fix typo in trackselection config,!29180WIP: Add multiplicity calculations to JetEtMiss code,!29085TRT modification for fractional charged particles,!28623Overlay as part of FastChain transform in 21.3,!28497ART tests - fixing the bugs,!27685update MG version to 2.6.7p3.atlas4,!27668Massimos 21.3 bis78,!27299WIP: Turning b-jet thinning off in SUSY1 (permanent?),!27254WIP: Exclusive jets request -- Fix ExclusiveJets algo / ATR-17320,!27094JETM8 UFO fix,!26790Fixes for Simulation ART jobs (ATLASSIM-4309),!26747Update frozen shower generation scripts and code to be compatible with recent developments,!26641Rename member functions to start with lower case,!26592Master upload 2018 global monitoring scripts p2,!2618221.0 z counting,!25405Add new ART test: test_physics_pp_v8_chainorder_build.sh,!2498621.6 transf,!24487Time-stamped PFlow containers in output DAOD,!24347Electron-in-jet and overlap removal interplay fixed,!24210WIP: Add syst for r21 vs r20.7 differences to defaults,!2420321.3 l1 muon 00 - new MuCTPI_RDO.h,!24037Make DCS Calculator dependent on sqlalchemy; fix python code quality issues,!23744New trigger derivation for jet substructure,!23377WIP pixel ID scheme for ITk,!23330Inner Detector create misalignments: radial distortions,!2325521.0 z counting,!22695Master salva id perf mon,!2230421.0-ART_test-InDetPhysValMonitoring,!22214add an utility function to TrigT1TGCRecRoiSvc for storing ROI position and the eta/phi size,!22172changes related to 1-3 points in ATR-19579,!22124Changes related to ticket 19579,!22118Remove cabling information for new thresholds,!21684WIP: test push into tdaq-htt,!21621Updating fJVT WP with new recommendations in TopCPTools,!2153821.0-ART_test-InDetPhysValMonitoring,!21325Tilecal new laser unpack 2019 02 19,!21304WIP: Fix ATR-19377 L1Topo vbs alg,!2117721.3 po bugfixes,!21039Merging in features for HTT Bank Generation,!2089821.2 rpv1l,!20518Mydev
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 257 additions and 265 deletions
TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
+ 11
− 7
View file @ 9c562ded
......@@ -30,8 +30,6 @@
#define NCHANNELS 48
#define NSLICES 100
#define NFIBERS 2
#define NPMT1 21
#define NPMT2 22
class TileRawChannelContainer;
......@@ -95,10 +93,13 @@ class TileLaserDefaultCalibTool : public AthAlgTool, virtual public ITileCalibTo
float m_las_time; // Event time
// LASERII
float m_ratio_LASERII[NDIODES][NGAINS][4][NDRAWERS][NCHANNELS][NGAINS]; // Calib coefficients computed for this run (for all diodes, PMTs, phocal, CIS)
float m_ratio_S_LASERII[NDIODES][NGAINS][4][NDRAWERS][NCHANNELS][NGAINS]; // Corresponding RMS
float m_ratio_LASERII[NDIODES][NGAINS][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Calib coefficients computed for this run (for all diodes, PMTs, phocal, CIS)
float m_ratio_S_LASERII[NDIODES][NGAINS][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Corresponding RMS
float m_ratio_LASERII_good[NDIODES][NGAINS][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Calib coefficients computed for this run (for all diodes, PMTs, phocal, CIS)
float m_ratio_S_LASERII_good[NDIODES][NGAINS][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Corresponding RMS
RunningStat* m_rs_ratio_LASERII[NDIODES][NGAINS][4][NDRAWERS][NCHANNELS][NGAINS];
RunningStat* m_rs_ratio_LASERII[NDIODES][NGAINS][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
RunningStat* m_rs_ratio_LASERII_good[NDIODES][NGAINS][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
// FIRST PART OF DATA FRAGMENT
/* float m_chan_LAS[32]; // Mean value for monitoring diodes, PMTs, phocal, CIS in Laser runs
......@@ -150,11 +151,14 @@ class TileLaserDefaultCalibTool : public AthAlgTool, virtual public ITileCalibTo
float m_diode_SAlpha[NDIODES_LASER1]; // RMS of alpha spectra
float m_ratio[NDIODES_LASER1][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Calib coefficients computed for this run (for all diodes)
float m_ratio_S[NDIODES_LASER1][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Corresponding RMS
float m_ratio_good[NDIODES_LASER1][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Calib coefficients computed for this run (for all diodes)
float m_ratio_good_S[NDIODES_LASER1][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Corresponding RMS
float m_pmt_ratios[NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Calib coefficients computed for this run (for all diodes)
float m_pmt_S_ratios[NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS]; // Corresponding RMS
RunningStat* m_rs_diode_signal[NDIODES_LASER1];
RunningStat* m_rs_PMT_signal[NPMTS];
RunningStat* m_rs_ratio[NDIODES_LASER1][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
RunningStat* m_rs_ratio_good[NDIODES_LASER1][NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
RunningStat* m_rs_pmt_ratios[NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
......@@ -186,10 +190,10 @@ class TileLaserDefaultCalibTool : public AthAlgTool, virtual public ITileCalibTo
RunningStat* m_rs_time[NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
RunningStat* m_rs_signal[NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
RunningStat* m_rs_raw_signal[NPARTITIONS][NDRAWERS][NCHANNELS][NGAINS];
RunningStat* m_rs_reducedKappa[NPARTITIONS][NDRAWERS][NPMT1][NPMT2][NGAINS][NFIBERS];
RunningStat* m_rs_reducedKappa[NPARTITIONS][NDRAWERS][NCOUPLES-1][NCOUPLES][NGAINS][NFIBERS];
// Functions
std::pair<unsigned int, unsigned int> getCoupleOfChan(int ros, int couple);
// std::pair<unsigned int, unsigned int> getCoupleOfChan(int ros, int couple);
std::pair<unsigned int, unsigned int> getCoupleOfPMT(int ros, int couple);
short isCellBad(int ros, int drawer, int channel, int gain);
......
TileCalorimeter/TileCalib/TileCalibAlgs/doc/packagedoc.h
+ 0
− 10
View file @ 9c562ded
......@@ -65,16 +65,6 @@ package a detailed documentation would not make much sense.
@ref used_TileCalibAlgs
@ref requirements_TileCalibAlgs
*/
/**
@page used_TileCalibAlgs Used Packages
*/
/**
@page requirements_TileCalibAlgs Requirements
*/
TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/aux_functions.py
+ 0
− 2
View file @ 9c562ded
......@@ -27,8 +27,6 @@ def checkPMTValid(ros, pmt):
def checkChannelValid(ros, mod, chan):
#util = PyCintex.gbl.TileCalibUtils()
ros += 1
# ROS Format:
......
TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/calc_mb_corr.py
+ 0
− 2
View file @ 9c562ded
#!/bin/env python
# Author: Michael Miller <miller@uchicago.edu>
import os, struct, sys
import ROOT
import PyCintex
from aux_functions import *
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment