Skip to content

Commit

Permalink
Merge pull request #44246 from fwyzard/add_final_newline_Reconstruction
Browse files Browse the repository at this point in the history
Add missing newlines in Reconstruction modules
  • Loading branch information
cmsbuild authored Feb 29, 2024
2 parents 04f93bc + b03b1e9 commit ee2b1c3
Show file tree
Hide file tree
Showing 40 changed files with 251 additions and 262 deletions.
2 changes: 1 addition & 1 deletion RecoBTag/Combined/python/caloDeepCSVTagInfos_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
'TrackDeepNNTagInfoProducer',
svTagInfos = cms.InputTag('inclusiveSecondaryVertexFinderTagInfos'),
computer = combinedSecondaryVertexCommon
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
typedef TemplatedNegativeTrackCountingComputer<std::vector<reco::CandidatePtr>, reco::JetTagInfo>
CandidateNegativeTrackCountingComputer;

#endif // ImpactParameter_CandNegativeTrackCountingComputer_h
#endif // ImpactParameter_CandNegativeTrackCountingComputer_h
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

typedef TemplatedNegativeTrackCountingComputer<reco::TrackRefVector, reco::JTATagInfo> NegativeTrackCountingComputer;

#endif // ImpactParameter_NegativeTrackCountingComputer_h
#endif // ImpactParameter_NegativeTrackCountingComputer_h
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ class TemplatedNegativeTrackCountingComputer : public TemplatedTrackCountingComp
}
};

#endif // ImpactParameter_TemplatedNegativeTrackCountingComputer_h
#endif // ImpactParameter_TemplatedNegativeTrackCountingComputer_h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
))
))
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
),
)

process.p = cms.Path(process.demo)
process.p = cms.Path(process.demo)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"NAME",
"NAME",
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"NAME",
"NAME",
2 changes: 1 addition & 1 deletion RecoBTag/PerformanceDB/test/tableinput_ALL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ PerformancePayloadFromTable
1 2
0 1.7 30 50 .7 0.07 .1 .01 .05 .01
1.7 2.4 30 50 .6 0.07 .05 .01 .02 .01
0 2.4 50 100 .5 0.07 0.1 0.01 .01 .01
0 2.4 50 100 .5 0.07 0.1 0.01 .01 .01
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
vertexIndex = cms.int32(0),
particleBasedIsolation = cms.InputTag("particleBasedIsolation", "gedPhotons"),
)
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(gedPhotonsTmp.PhotonDNNPFid,
enabled = True
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ products are:
Last updated: @DATE@ Paolo Meridiani


*/
*/
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import RecoLocalCalo.EcalRecProducers.ecalUncalibRecHitPhase2WeightsProducerGPU_cfi as _mod
ecalUncalibRecHitPhase2GPU = _mod.ecalUncalibRecHitPhase2WeightsProducerGPU.clone()
ecalUncalibRecHitPhase2GPU = _mod.ecalUncalibRecHitPhase2WeightsProducerGPU.clone()
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import RecoLocalCalo.EcalRecProducers.ecalUncalibRecHitPhase2WeightsProducer_cfi as _mod
ecalUncalibRecHitPhase2 = _mod.ecalUncalibRecHitPhase2WeightsProducer.clone()
ecalUncalibRecHitPhase2 = _mod.ecalUncalibRecHitPhase2WeightsProducer.clone()
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ struct HFNoseTilesConstants {
static constexpr int nTiles = nColumns * nRows;
};

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ class HGCalSiliconStrategy {};

class HGCalScintillatorStrategy {};

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ struct HGCalScintillatorTilesConstants {
static constexpr int nTiles = nColumns * nRows;
};

#endif
#endif
2 changes: 1 addition & 1 deletion RecoLocalCalo/HGCalRecProducers/plugins/HGCalCLUEAlgo.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,4 @@ using HGCalSiCLUEAlgo = HGCalCLUEAlgoT<HGCalSiliconLayerTiles, HGCalSiliconStrat
using HGCalSciCLUEAlgo = HGCalCLUEAlgoT<HGCalScintillatorLayerTiles, HGCalScintillatorStrategy>;
using HFNoseCLUEAlgo = HGCalCLUEAlgoT<HFNoseLayerTiles, HGCalSiliconStrategy>;

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ EDM_REGISTER_VALIDATED_PLUGINFACTORY(HGCalLayerClusterAlgoFactory, "HGCalLayerCl
DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HGCalImagingAlgo, "Imaging");
DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HGCalSiCLUEAlgo, "SiCLUE");
DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HGCalSciCLUEAlgo, "SciCLUE");
DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HFNoseCLUEAlgo, "HFNoseCLUE");
DEFINE_EDM_VALIDATED_PLUGIN(HGCalLayerClusterAlgoFactory, HFNoseCLUEAlgo, "HFNoseCLUE");
2 changes: 1 addition & 1 deletion RecoLocalTracker/Configuration/doc/RecoLocalTrackerAOD.doi
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!-- no AOD producer in RecoLocalTracker -->
<!-- no AOD producer in RecoLocalTracker -->
2 changes: 1 addition & 1 deletion RecoLocalTracker/SiPixelRecHits/src/PixelCPEFastParams.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ using PixelCPEFastParamsPhase1 = PixelCPEFastParamsDevice<alpaka_common::DevHost
using PixelCPEFastParamsPhase2 = PixelCPEFastParamsDevice<alpaka_common::DevHost, pixelTopology::Phase2>;

TYPELOOKUP_DATA_REG(PixelCPEFastParamsPhase1);
TYPELOOKUP_DATA_REG(PixelCPEFastParamsPhase2);
TYPELOOKUP_DATA_REG(PixelCPEFastParamsPhase2);
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@
# Add early deletion of temporary data products to reduce peak memory need
from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete
process = customiseEarlyDelete(process)
# End adding early deletion
# End adding early deletion
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,4 @@
# Add early deletion of temporary data products to reduce peak memory need
from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete
process = customiseEarlyDelete(process)
# End adding early deletion
# End adding early deletion
171 changes: 82 additions & 89 deletions RecoLocalTracker/SiStripZeroSuppression/test/displayBaselineMacro.C
Original file line number Diff line number Diff line change
Expand Up @@ -16,101 +16,94 @@
#include "math.h"
#include "map"




void displayBaselineMacro(TString file, int limit){
TFile *f;//, *fo;
void displayBaselineMacro(TString file, int limit) {
TFile* f; //, *fo;
TString BaseDir;
TString dir[4];
TString fullPath, title, subDet, genSubDet;
TCanvas *C;
C = new TCanvas();
f = new TFile(file);
// fo = new TFile(ofile, "RECREATE");
//BaseDir="DQMData/Results/SpyChannel/";
dir[0]="baselineAna/ProcessedRawDigis";
dir[1]="baselineAna/Baseline";
dir[2]="baselineAna/Clusters";
dir[3]="baselineAna/RawDigis";
f->cd();
// fo->Write();
// fo->Close();
f->cd(dir[0]);

TIter nextkey(gDirectory->GetListOfKeys());
TKey *key;
int objcounter=1;
int histolimit =0;
while ((key = (TKey*)nextkey())) {
if(histolimit< limit){
histolimit++;
TObject *obj = key->ReadObj();

TCanvas* C;
C = new TCanvas();
f = new TFile(file);
// fo = new TFile(ofile, "RECREATE");
//BaseDir="DQMData/Results/SpyChannel/";
dir[0] = "baselineAna/ProcessedRawDigis";
dir[1] = "baselineAna/Baseline";
dir[2] = "baselineAna/Clusters";
dir[3] = "baselineAna/RawDigis";
f->cd();
// fo->Write();
// fo->Close();
f->cd(dir[0]);

TIter nextkey(gDirectory->GetListOfKeys());
TKey* key;
int objcounter = 1;
int histolimit = 0;
while ((key = (TKey*)nextkey())) {
if (histolimit < limit) {
histolimit++;
TObject* obj = key->ReadObj();

if (obj->IsA()->InheritsFrom("TH1")) {
std::cout << "Found object n: " << objcounter << " Name: " << obj->GetName() << " Title: " << obj->GetTitle()
<< std::endl;
++objcounter;
//if (strstr(obj->GetTitle(),"470116592")!=NULL)
// continue;

C->Clear();
TH1F* h = (TH1F*)key->ReadObj();

//TLegend leg(0.6,0.9,0.8,1,"");
//leg.AddEntry(h,"VR - Ped - apvCM_{mean}","lep");

h->SetLineWidth(2);
h->SetXTitle("StripNumber");
h->SetYTitle("Charge (ADC counts)");
h->Draw("hist p l");
f->cd();
//f->cd(dir[1]);
TH1F* hb = (TH1F*)f->Get(dir[1] + "/" + obj->GetName());

if (hb != 0) {
hb->SetLineWidth(2);
hb->SetLineStyle(2);
hb->SetLineColor(2);
//leg.AddEntry(hb,"clusters","lep");
hb->Draw("hist p l same");
}

f->cd();
//f->cd(dir[1]);
TH1F* hc = (TH1F*)f->Get(dir[2] + "/" + obj->GetName());

if (hc != 0) {
hc->SetLineWidth(2);
hc->SetLineStyle(2);
hc->SetLineColor(3);
//leg.AddEntry(hb,"clusters","lep");
hc->Draw("hist p l same");
}
TH1F* hd = (TH1F*)f->Get(dir[3] + "/" + obj->GetName());

if ( obj->IsA()->InheritsFrom( "TH1" ) ) {

std::cout << "Found object n: " << objcounter << " Name: " << obj->GetName() << " Title: " << obj->GetTitle()<< std::endl;
++objcounter;
//if (strstr(obj->GetTitle(),"470116592")!=NULL)
// continue;
if (hd != 0) {
hd->SetLineWidth(2);
hd->SetLineStyle(2);
hd->SetLineColor(6);
//leg.AddEntry(hb,"clusters","lep");
hd->Draw("hist p l same");
}

C->Clear();
TH1F* h = (TH1F*)key->ReadObj();
else
std::cout << "not found " << obj->GetName() << std::endl;
//leg.Draw();

//TLegend leg(0.6,0.9,0.8,1,"");
//leg.AddEntry(h,"VR - Ped - apvCM_{mean}","lep");
C->Update();
// fo->cd();
// C->Write();

h->SetLineWidth(2);
h->SetXTitle("StripNumber");
h->SetYTitle("Charge (ADC counts)");
h->Draw("hist p l");
f->cd();
//f->cd(dir[1]);
TH1F* hb = (TH1F*) f->Get(dir[1]+"/"+obj->GetName());

if(hb!=0){
hb->SetLineWidth(2);
hb->SetLineStyle(2);
hb->SetLineColor(2);
//leg.AddEntry(hb,"clusters","lep");
hb->Draw("hist p l same");
}

f->cd();
//f->cd(dir[1]);
TH1F* hc = (TH1F*) f->Get(dir[2]+"/"+obj->GetName());

if(hc!=0){
hc->SetLineWidth(2);
hc->SetLineStyle(2);
hc->SetLineColor(3);
//leg.AddEntry(hb,"clusters","lep");
hc->Draw("hist p l same");
}
TH1F* hd = (TH1F*) f->Get(dir[3]+"/"+obj->GetName());

if(hd!=0){
hd->SetLineWidth(2);
hd->SetLineStyle(2);
hd->SetLineColor(6);
//leg.AddEntry(hb,"clusters","lep");
hd->Draw("hist p l same");
}

else
std::cout << "not found " << obj->GetName()<< std::endl;
//leg.Draw();


C->Update();
// fo->cd();
// C->Write();

C->SaveAs(TString("img/")+obj->GetName()+TString(".png"));


C->SaveAs(TString("img/") + obj->GetName() + TString(".png"));
}
}
}
}
}
}
Loading

0 comments on commit ee2b1c3

Please sign in to comment.