Skip to content

Updating ECALELF to 92x #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yhaddad wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updating ECALELF to 92x #115

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98029a7
topic-update-attempt-92x
yhaddad Jun 7, 2017
ce8e200
updatig boost::shared poiters
yhaddad Jun 12, 2017
0cc3c04
update setup_git.sh
yhaddad Jun 12, 2017
fff9d3f
updated README.md
yhaddad Jun 12, 2017
941e2b2
astyle formatting
yhaddad Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion EOverPCalibration/interface/ConvoluteTemplate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef ConvoluteTemplate_h
#define ConvoluteTemplate_h

#include "histoFunc.h"
#include "Calibration/EOverPCalibration/interface/histoFunc.h"

#include "TH1.h"
#include "TF1.h"
Expand Down
8 changes: 4 additions & 4 deletions EOverPCalibration/interface/FastCalibratorEB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
#include <TH1F.h>
#include <TProfile.h>
#include <vector>
#include "../interface/hChain.h"
#include "../interface/h2Chain.h"
#include "Calibration/EOverPCalibration/interface/hChain.h"
#include "Calibration/EOverPCalibration/interface/h2Chain.h"
#include <TGraphErrors.h>

#include <TLorentzVector.h>
//#include "Math/PtEtaPhiE4D.h"
//#include "Math/PtEtaPhiM4D.h"
//#include "Math/LorentzVector.h"

#include "../interface/CalibrationUtils.h"
#include "../interface/readJSONFile.h"
#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h"
#include "Calibration/EOverPCalibration/interface/readJSONFile.h"

class FastCalibratorEB
{
Expand Down
6 changes: 3 additions & 3 deletions EOverPCalibration/interface/FastCalibratorEE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
/* #include <TMath.h> */
/* #include <TProfile.h> */
/* #include <vector> */
#include "../interface/hChain.h"
#include "../interface/h2Chain.h"
#include "Calibration/EOverPCalibration/interface/hChain.h"
#include "Calibration/EOverPCalibration/interface/h2Chain.h"
#include <TGraphErrors.h>

/* #include <TLorentzVector.h> */
Expand All @@ -26,7 +26,7 @@

/* #include "../interface/CalibrationUtils.h" */
/* #include "../interface/readJSONFile.h" */
#include "../interface/TEndcapRings.h"
#include "Calibration/EOverPCalibration/interface/TEndcapRings.h"

class FastCalibratorEE
{
Expand Down
4 changes: 2 additions & 2 deletions EOverPCalibration/interface/GetHashedIndexEB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <TH1F.h>
#include <TProfile.h>
#include <vector>
#include "../interface/hChain.h"
#include "../interface/h2Chain.h"
#include "Calibration/EOverPCalibration/interface/hChain.h"
#include "Calibration/EOverPCalibration/interface/h2Chain.h"
#include <TGraphErrors.h>

#include <TLorentzVector.h>
Expand Down
4 changes: 2 additions & 2 deletions EOverPCalibration/interface/GetHashedIndexEE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <TH1F.h>
#include <TProfile.h>
#include <vector>
#include "../interface/hChain.h"
#include "../interface/h2Chain.h"
#include "Calibration/EOverPCalibration/interface/hChain.h"
#include "Calibration/EOverPCalibration/interface/h2Chain.h"
#include <TGraphErrors.h>

#include <TLorentzVector.h>
Expand Down
8 changes: 4 additions & 4 deletions EOverPCalibration/interface/XtalAlphaEB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
#include <TH1F.h>
#include <TProfile.h>
#include <vector>
#include "../interface/hChain.h"
#include "../interface/h2Chain.h"
#include "Calibration/EOverPCalibration/interface/hChain.h"
#include "Calibration/EOverPCalibration/interface/h2Chain.h"
#include <TGraphErrors.h>

#include <TLorentzVector.h>

#include "../interface/CalibrationUtils.h"
#include "../interface/readJSONFile.h"
#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h"
#include "Calibration/EOverPCalibration/interface/readJSONFile.h"

class XtalAlphaEB
{
Expand Down
12 changes: 6 additions & 6 deletions EOverPCalibration/interface/XtalAlphaEE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
#include <TH1F.h>
#include <TProfile.h>
#include <vector>
#include "../interface/hChain.h"
#include "../interface/h2Chain.h"
#include "Calibration/EOverPCalibration/interface/hChain.h"
#include "Calibration/EOverPCalibration/interface/h2Chain.h"
#include <TGraphErrors.h>


#include "../interface/CalibrationUtils.h"
#include "../interface/readJSONFile.h"
#include "../interface/TEndcapRings.h"
#include "../interface/TSicCrystals.h"
#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h"
#include "Calibration/EOverPCalibration/interface/readJSONFile.h"
#include "Calibration/EOverPCalibration/interface/TEndcapRings.h"
#include "Calibration/EOverPCalibration/interface/TSicCrystals.h"

class XtalAlphaEE
{
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/CalibrationUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/CalibrationUtils.h"
#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h"
#include <fstream>
#include <TF1.h>

Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/ConfigFileLine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* for it.
*/

#include "../interface/ConfigFileLine.h"
#include "Calibration/EOverPCalibration/interface/ConfigFileLine.h"
#include <iostream>

using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/ConvoluteTemplate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/ConvoluteTemplate.h"
#include "Calibration/EOverPCalibration/interface/ConvoluteTemplate.h"



Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/DrawingUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/DrawingUtils.h"
#include "Calibration/EOverPCalibration/interface/DrawingUtils.h"



Expand Down
4 changes: 2 additions & 2 deletions EOverPCalibration/src/FastCalibratorEB.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//adapting it to ECALELF ntuple

#include "../interface/FastCalibratorEB.h"
#include "../interface/GetHashedIndexEB.h"
#include "Calibration/EOverPCalibration/interface/FastCalibratorEB.h"
#include "Calibration/EOverPCalibration/interface/GetHashedIndexEB.h"
#include <TH2.h>
#include <TF1.h>
#include <TStyle.h>
Expand Down
6 changes: 3 additions & 3 deletions EOverPCalibration/src/FastCalibratorEE.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "../interface/FastCalibratorEE.h"
#include "../interface/GetHashedIndexEE.h"
#include "Calibration/EOverPCalibration/interface/FastCalibratorEE.h"
#include "Calibration/EOverPCalibration/interface/GetHashedIndexEE.h"
#include <fstream>
#include <TRandom3.h>
#include <TString.h>
#include "../interface/CalibrationUtils.h"
#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h"


/// Default constructor
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/GetHashedIndexEB.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/GetHashedIndexEB.h"
#include "Calibration/EOverPCalibration/interface/GetHashedIndexEB.h"

int GetHashedIndexEB(int iEta, int iPhi, int Zside)
{
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/GetHashedIndexEE.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/GetHashedIndexEE.h"
#include "Calibration/EOverPCalibration/interface/GetHashedIndexEE.h"

const int kxf[] = {
41, 51, 41, 51, 41, 51, 36, 51, 36, 51,
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/LHEReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/LHEReader.h"
#include "Calibration/EOverPCalibration/interface/LHEReader.h"



Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/LaserMonitoringEoP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Class for the monitoring of laser corrections with E/p

#include "../interface/LaserMonitoringEoP.h"
#include "Calibration/EOverPCalibration/interface/LaserMonitoringEoP.h"
#include <TH2.h>
#include <TF1.h>
#include <TStyle.h>
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/TEndcapRings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/TEndcapRings.h"
#include "Calibration/EOverPCalibration/interface/TEndcapRings.h"



Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/TSicCrystals.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/TSicCrystals.h"
#include "Calibration/EOverPCalibration/interface/TSicCrystals.h"

// default constructor, reading the map from file
TSicCrystals::TSicCrystals()
Expand Down
4 changes: 2 additions & 2 deletions EOverPCalibration/src/XtalAlphaEB.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "../interface/XtalAlphaEB.h"
#include "../interface/GetHashedIndexEB.h"
#include "Calibration/EOverPCalibration/interface/XtalAlphaEB.h"
#include "Calibration/EOverPCalibration/interface/GetHashedIndexEB.h"
#include <TH2.h>
#include <TF1.h>
#include <TStyle.h>
Expand Down
4 changes: 2 additions & 2 deletions EOverPCalibration/src/XtalAlphaEE.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "../interface/XtalAlphaEE.h"
#include "../interface/GetHashedIndexEE.h"
#include "Calibration/EOverPCalibration/interface/XtalAlphaEE.h"
#include "Calibration/EOverPCalibration/interface/GetHashedIndexEE.h"
#include <TH2.h>
#include <TF1.h>
#include <TStyle.h>
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/Zutils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/Zutils.h"
#include "Calibration/EOverPCalibration/interface/Zutils.h"
#include <cmath>
#include "TMath.h"
#include "TRandom3.h"
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/geometryUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/geometryUtils.h"
#include "Calibration/EOverPCalibration/interface/geometryUtils.h"

// --- EE ---
// default constructor, reading the map from file
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/h2Chain.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/h2Chain.h"
#include "Calibration/EOverPCalibration/interface/h2Chain.h"

h2Chain::h2Chain (TString baseName, TString baseTitle,
int nbinsx, double minx, double maxx,
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/hChain.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/hChain.h"
#include "Calibration/EOverPCalibration/interface/hChain.h"
#include "TStyle.h"
#include "TROOT.h"
#include "TCanvas.h"
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/ntpleUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/ntpleUtils.h"
#include "Calibration/EOverPCalibration/interface/ntpleUtils.h"


// ------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/ntpleUtils2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/ntpleUtils2.h"
#include "Calibration/EOverPCalibration/interface/ntpleUtils2.h"

TH1F* templateHisto;
TF1* templateFunc;
Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/readJSONFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/readJSONFile.h"
#include "Calibration/EOverPCalibration/interface/readJSONFile.h"



Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/stabilityUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/stabilityUtils.h"
#include "Calibration/EOverPCalibration/interface/stabilityUtils.h"

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion EOverPCalibration/src/treeReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../interface/treeReader.h"
#include "Calibration/EOverPCalibration/interface/treeReader.h"

treeReader::treeReader (TTree * tree, bool verbosity) :
m_tree (tree),
Expand Down
33 changes: 16 additions & 17 deletions EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AlCaECALRecHitReducer::AlCaECALRecHitReducer(const edm::ParameterSet& iConfig)

std::vector<edm::InputTag> srcLabels = iConfig.getParameter< std::vector<edm::InputTag> >("srcLabels");
for ( auto inputTag = srcLabels.begin(); inputTag != srcLabels.end(); ++inputTag) {
eleViewTokens_.push_back(consumes<edm::View <reco::RecoCandidate> >(*inputTag));
eleViewTokens_.push_back(consumes<edm::View <reco::RecoCandidate> >(*inputTag));
}

//eleViewToken_ = consumes<edm::View <reco::RecoCandidate> > (iConfig.getParameter< edm::InputTag > ("electronLabel"));
Expand Down Expand Up @@ -130,19 +130,19 @@ AlCaECALRecHitReducer::produce (edm::Event& iEvent,
iEvent.getByToken(EESuperClusterToken_, EESCHandle);

//Create empty output collections
std::auto_ptr< EBRecHitCollection > miniEBRecHitCollection (new EBRecHitCollection) ;
std::auto_ptr< EERecHitCollection > miniEERecHitCollection (new EERecHitCollection) ;
std::auto_ptr< ESRecHitCollection > miniESRecHitCollection (new ESRecHitCollection) ;
std::auto_ptr< EBUncalibratedRecHitCollection > miniEBUncalibRecHitCollection (new EBUncalibratedRecHitCollection) ;
std::auto_ptr< EEUncalibratedRecHitCollection > miniEEUncalibRecHitCollection (new EEUncalibratedRecHitCollection) ;
std::unique_ptr< EBRecHitCollection > miniEBRecHitCollection (new EBRecHitCollection) ;
std::unique_ptr< EERecHitCollection > miniEERecHitCollection (new EERecHitCollection) ;
std::unique_ptr< ESRecHitCollection > miniESRecHitCollection (new ESRecHitCollection) ;
std::unique_ptr< EBUncalibratedRecHitCollection > miniEBUncalibRecHitCollection (new EBUncalibratedRecHitCollection) ;
std::unique_ptr< EEUncalibratedRecHitCollection > miniEEUncalibRecHitCollection (new EEUncalibratedRecHitCollection) ;

std::set<DetId> reducedRecHit_EBmap;
std::set<DetId> reducedRecHit_EEmap;
std::set<DetId> reducedRecHit_ESmap;

// std::set< edm::Ref<reco::CaloCluster> > reducedCaloClusters_map;

std::auto_ptr< reco::CaloClusterCollection > reducedCaloClusterCollection (new reco::CaloClusterCollection);
std::unique_ptr< reco::CaloClusterCollection > reducedCaloClusterCollection (new reco::CaloClusterCollection);

//Photons:
#ifdef shervin
Expand All @@ -166,11 +166,11 @@ AlCaECALRecHitReducer::produce (edm::Event& iEvent,
#endif

Handle<edm::View < reco::RecoCandidate> > eleViewHandle;
for(auto iToken = eleViewTokens_.begin(); iToken != eleViewTokens_.end(); iToken++) {
for( auto iToken = eleViewTokens_.begin(); iToken != eleViewTokens_.end(); iToken++) {
iEvent.getByToken(*iToken, eleViewHandle);

//Electrons:
for (auto eleIt = eleViewHandle->begin(); eleIt != eleViewHandle->end(); eleIt++) {
for ( auto eleIt = eleViewHandle->begin(); eleIt != eleViewHandle->end(); eleIt++) {
const reco::SuperCluster& sc = *(eleIt->superCluster()) ;

if (sc.seed()->seed().subdetId() == EcalBarrel) {
Expand Down Expand Up @@ -238,13 +238,12 @@ AlCaECALRecHitReducer::produce (edm::Event& iEvent,
}

//--------------------------------------- Put selected information in the event
iEvent.put( miniEBRecHitCollection, alcaBarrelHitsCollection_ );
iEvent.put( miniEBUncalibRecHitCollection, alcaBarrelUncalibHitsCollection_ );
iEvent.put( miniEERecHitCollection, alcaEndcapHitsCollection_ );
iEvent.put( miniEEUncalibRecHitCollection, alcaEndcapUncalibHitsCollection_ );
iEvent.put( miniESRecHitCollection, alcaPreshowerHitsCollection_ );

iEvent.put( reducedCaloClusterCollection, alcaCaloClusterCollection_);
iEvent.put( std::move( miniEBRecHitCollection ), alcaBarrelHitsCollection_ );
iEvent.put( std::move( miniEBUncalibRecHitCollection ), alcaBarrelUncalibHitsCollection_ );
iEvent.put( std::move( miniEERecHitCollection ), alcaEndcapHitsCollection_ );
iEvent.put( std::move( miniEEUncalibRecHitCollection ), alcaEndcapUncalibHitsCollection_ );
iEvent.put( std::move( miniESRecHitCollection ), alcaPreshowerHitsCollection_ );
iEvent.put( std::move( reducedCaloClusterCollection ), alcaCaloClusterCollection_);
}

void AlCaECALRecHitReducer::AddMiniRecHitCollection(const reco::SuperCluster& sc,
Expand Down Expand Up @@ -273,7 +272,7 @@ void AlCaECALRecHitReducer::AddMiniRecHitCollection(const reco::SuperCluster& sc

if (sc.preshowerClusters().isAvailable()) {
// std::cout << "[DEBUG] Preshower available!" << std::endl;
for(auto iES = sc.preshowerClustersBegin(); iES != sc.preshowerClustersEnd(); ++iES) {
for( auto iES = sc.preshowerClustersBegin(); iES != sc.preshowerClustersEnd(); ++iES) {
const std::vector< std::pair<DetId, float> >& hits = (*iES)->hitsAndFractions();
for(std::vector<std::pair<DetId, float> >::const_iterator rh = hits.begin(); rh != hits.end(); ++rh) {
reducedESRecHitMap.insert(rh->first);
Expand Down
8 changes: 4 additions & 4 deletions EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ void AlCaElectronTracksReducer::produce (edm::Event& iEvent,
iEvent.getByToken(generalTracksExtraToken_, generalTracksExtraHandle);

//Create empty output collections
std::auto_ptr< TrackCollection > redGeneralTracksCollection (new TrackCollection) ;
std::auto_ptr< TrackExtraCollection > redGeneralTracksExtraCollection (new TrackExtraCollection) ;
std::unique_ptr< TrackCollection > redGeneralTracksCollection (new TrackCollection) ;
std::unique_ptr< TrackExtraCollection > redGeneralTracksExtraCollection (new TrackExtraCollection) ;

reco::GsfElectronCollection::const_iterator eleIt;

Expand All @@ -65,8 +65,8 @@ void AlCaElectronTracksReducer::produce (edm::Event& iEvent,
}

//Put selected information in the event
iEvent.put( redGeneralTracksCollection, alcaTrackCollection_ );
iEvent.put( redGeneralTracksExtraCollection, alcaTrackExtraCollection_ );
iEvent.put( std::move(redGeneralTracksCollection), alcaTrackCollection_ );
iEvent.put( std::move(redGeneralTracksExtraCollection), alcaTrackExtraCollection_ );
}


Expand Down
4 changes: 2 additions & 2 deletions EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ void SelectedElectronFEDListProducer<TEle, TCand>::produce(edm::Event & iEvent,
}

// make the final raw data collection
std::auto_ptr<FEDRawDataCollection> streamFEDRawProduct(new FEDRawDataCollection());
std::unique_ptr<FEDRawDataCollection> streamFEDRawProduct(new FEDRawDataCollection());
std::sort(fedList_.begin(), fedList_.end());
std::vector<uint32_t>::const_iterator itfedList = fedList_.begin();
for( ; itfedList != fedList_.end() ; ++itfedList) {
Expand All @@ -580,7 +580,7 @@ void SelectedElectronFEDListProducer<TEle, TCand>::produce(edm::Event & iEvent,
}
}

iEvent.put(streamFEDRawProduct, outputLabelModule_);
iEvent.put(std::move( streamFEDRawProduct ), outputLabelModule_);

if(!fedList_.empty()) fedList_.clear();

Expand Down
Loading