Skip to content

Revert "first commit" #16

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
ocolegro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "first commit" #16

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added PFCalEE/.README.md.swp
View file
Open in desktop
Binary file not shown.
8 changes: 3 additions & 5 deletions PFCalEE/PFCalEE.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,25 @@ int main(int argc, char** argv) {
G4RunManager * runManager = new G4RunManager;

// Set mandatory initialization classes
int version = DetectorConstruction::HGCAL_E26_TH;
int version = DetectorConstruction::v_HGCALEE_v6;

int model = DetectorConstruction::m_FULLSECTION;

bool signal = true;
std::string data = "";
double steelThick= 0;
if (argc > 2)
version = atoi(argv[2]);
if (argc > 3)
model = atoi(argv[3]);
if (argc > 4)
signal = atoi(argv[4]);
if (argc > 5)
steelThick = std::stof(argv[5]);

data = argv[5];
std::cout << "-- Running version " << version << " model " << model
<< std::endl;

runManager->SetUserInitialization(
new DetectorConstruction(version, model, steelThick));
new DetectorConstruction(version, model, signal));
runManager->SetUserInitialization(new PhysicsList);

// Set user action classes
Expand Down
28 changes: 9 additions & 19 deletions PFCalEE/include/DetectorConstruction.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,11 @@ class DetectorConstruction: public G4VUserDetectorConstruction {
public:

enum DetectorVersion {
HGCAL_E26_TH = 1,
HGCAL_E26_T = 2,
HGCAL_E26_H = 3,
HGCAL_E26 = 4,
HGCAL_E40_TH = 5,
HGCAL_E40_T = 6,
HGCAL_E40_H = 7,
HGCAL_E40 = 8,
T = 9,
H = 10,
v_HGCALEE_v6 = 1,
v_HGCALEE_Tv6 = 2,
v_HGCALEE_v6_s05 = 3,
v_HGCALEE_v6_s10 = 4,
v_HGCALEE_v6_s20 = 5,

};

Expand All @@ -47,8 +42,8 @@ public:
/**
@short CTOR
*/
DetectorConstruction(G4int ver = DetectorConstruction::HGCAL_E26_TH,
G4int mod = DetectorConstruction::m_SIMPLE_20, G4double steelThick = 0);
DetectorConstruction(G4int ver = DetectorConstruction::v_HGCALEE_v6,
G4int mod = DetectorConstruction::m_SIMPLE_20, bool signal = false);

void buildHGCALFHE(const unsigned aVersion);
void buildHGCALBHE(const unsigned aVersion);
Expand Down Expand Up @@ -110,9 +105,7 @@ public:
G4double GetWorldSizeZ() {
return m_WorldSizeZ;
}
G4double GetSteelThick() {
return steelThick_;
}

unsigned initLayer() {
return initLayer_;
}
Expand All @@ -136,9 +129,6 @@ private:
@short compute the calor dimensions
*/
void UpdateCalorSize();
void buildTracker();
void buildECal();
void buildHCal(double steelThick);

/**
@short build the calorimeter
Expand All @@ -163,7 +153,7 @@ private:
G4double m_z0pos;
G4double m_WorldSizeXY, m_WorldSizeZ;
G4double m_nSectors, m_sectorWidth, m_interSectorWidth;
G4double steelThick_;

G4VSolid* m_solidWorld; //pointer to the solid World
G4LogicalVolume* m_logicWorld; //pointer to the logical World
G4VPhysicalVolume* m_physWorld; //pointer to the physical World
Expand Down
5 changes: 2 additions & 3 deletions PFCalEE/include/EventAction.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ public:
void Add(std::vector<SamplingSection> *newDetector) {
detector_ = newDetector;
}
std::vector<G4int> targetTrackIds,novelTrackIds;
HGCSSGenParticleVec genvec_;
std::vector<G4int> targetTrackIds,hadronTrackIds;

private:
RunAction* runAct;
Expand All @@ -60,7 +59,7 @@ private:
HGCSSSamplingSectionVec ssvec_;
HGCSSSimHitVec hitvec_;
HGCSSGenParticleVec targetvec_;
HGCSSGenParticleVec novelvec_;
HGCSSGenParticleVec hadronvec_;
EventActionMessenger* eventMessenger;

//std::ofstream fout_;
Expand Down
2 changes: 0 additions & 2 deletions PFCalEE/include/PrimaryGeneratorAction.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include "G4VUserPrimaryGeneratorAction.hh"
#include "globals.hh"
#include <map>
#include "EventAction.hh"

class G4Event;
class DetectorConstruction;
Expand Down Expand Up @@ -67,7 +66,6 @@ public:
G4String GetGeneratorName() const;

private:
EventAction *eventAction_;
int model_;
bool signal_;
std::string data_;
Expand Down
1 change: 0 additions & 1 deletion PFCalEE/include/SteppingAction.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ private:
G4EmSaturation* saturationEngine;
G4double timeLimit_;
G4int version_;
G4double zOff;

};

Expand Down
Loading