Skip to content
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

Jump to bottom

fix includes and forward declarations #19170

Merged
merged 1 commit into from Jun 10, 2017
Merged

fix includes and forward declarations #19170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions SimG4CMS/Forward/interface/CastorTestAnalysis.h
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
#include "SimG4Core/Notification/interface/Observer.h"
#include "SimG4Core/Watcher/interface/SimWatcher.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "SimG4CMS/Forward/interface/CastorNumberingScheme.h"
#include "SimG4CMS/Calo/interface/CaloG4Hit.h"
#include "SimG4CMS/Calo/interface/CaloG4HitCollection.h"

#include <cassert>
#include <iostream>
Expand Down Expand Up @@ -61,6 +61,7 @@ class BeginOfRun;
class EndOfRun;
class BeginOfEvent;
class EndOfEvent;
class CastorNumberingScheme;

class CastorTestAnalysis : public SimWatcher,
public Observer<const BeginOfJob *>,
Expand Down
1 change: 1 addition & 0 deletions SimG4CMS/Forward/interface/TotemSD.h
View file
Open in desktop
Expand Up @@ -38,6 +38,7 @@
#include <string>

class TrackingSlaveSD;
class SimTrackManager;

class TotemSD : public SensitiveTkDetector,
public Observer<const BeginOfEvent*>,
Expand Down
9 changes: 4 additions & 5 deletions SimG4CMS/Forward/src/CastorTestAnalysis.cc
View file
Open in desktop
Expand Up @@ -9,13 +9,12 @@
// Original Author: P. Katsas
// Created: 02/2007
//
#include "SimG4CMS/Calo/interface/CaloG4Hit.h"
#include "SimG4CMS/Calo/interface/CaloG4HitCollection.h"
#include "DataFormats/Math/interface/Point3D.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "SimG4CMS/Forward/interface/CastorTestAnalysis.h"
//#include "SimG4CMS/Forward/interface/CastorNumberingScheme.h"
#include "SimG4CMS/Forward/interface/CastorNumberingScheme.h"

#include "DataFormats/Math/interface/Point3D.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "TFile.h"
#include <cmath>
Expand Down
1 change: 0 additions & 1 deletion SimG4CMS/HcalTestBeam/interface/HcalTB02HistoClass.h
View file
Open in desktop

This file was deleted.

10 changes: 7 additions & 3 deletions SimG4Core/Physics/interface/PhysicsListMaker.h
View file
Open in desktop
Expand Up @@ -35,17 +35,21 @@ class PhysicsListMaker : public PhysicsListMakerBase
PhysicsListMaker(){}

// ---------- const member functions ---------------------
virtual std::auto_ptr<PhysicsList> make(G4LogicalVolumeToDDLogicalPartMap& map_,
virtual std::unique_ptr<PhysicsList> make(G4LogicalVolumeToDDLogicalPartMap& map_,
const HepPDT::ParticleDataTable * table_,
sim::ChordFinderSetter * chordFinderSetter_,
const edm::ParameterSet& p,
SimActivityRegistry& reg) const
{
std::auto_ptr<T> returnValue(new T(map_, table_, chordFinderSetter_, p));
std::unique_ptr<T> returnValue(new T(map_, table_, chordFinderSetter_, p));
SimActivityRegistryEnroller::enroll(reg, returnValue.get());

return std::auto_ptr<PhysicsList>(returnValue);
return returnValue;
}
private:

PhysicsListMaker(const PhysicsListMaker&) = delete;
const PhysicsListMaker& operator=(const PhysicsListMaker&) = delete;

};

Expand Down
23 changes: 8 additions & 15 deletions SimG4Core/Physics/interface/PhysicsListMakerBase.h
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@

// user include files
#include "HepPDT/ParticleDataTable.hh"
#include "SimG4Core/Physics/interface/PhysicsList.h"

// forward declarations
class SimActivityRegistry;
Expand All @@ -41,23 +42,15 @@ class PhysicsListMakerBase
PhysicsListMakerBase() {}
virtual ~PhysicsListMakerBase() {}

// ---------- const member functions ---------------------
virtual std::auto_ptr<PhysicsList> make(G4LogicalVolumeToDDLogicalPartMap&,
const HepPDT::ParticleDataTable * ,
sim::ChordFinderSetter *,
const edm::ParameterSet&,
SimActivityRegistry&) const = 0;

// ---------- static member functions --------------------

// ---------- member functions ---------------------------
virtual std::unique_ptr<PhysicsList> make(G4LogicalVolumeToDDLogicalPartMap&,
const HepPDT::ParticleDataTable * ,
sim::ChordFinderSetter *,
const edm::ParameterSet&,
SimActivityRegistry&) const = 0;

private:
//PhysicsListMakerBase(const PhysicsListMakerBase&); // stop default

//const PhysicsListMakerBase& operator=(const PhysicsListMakerBase&); // stop default

// ---------- member data --------------------------------
PhysicsListMakerBase(const PhysicsListMakerBase&) = delete;
const PhysicsListMakerBase& operator=(const PhysicsListMakerBase&) = delete;

};

Expand Down