Import Geant4 11.0.2 source tree
This commit is contained in:
@@ -214,7 +214,9 @@ void CCalEventAction::EndOfEventAction(const G4Event* evt){
|
||||
IDenergy = man->GetH1Id("h4000");
|
||||
man->FillH1(IDenergy,fullE);
|
||||
//2)
|
||||
#ifdef debug
|
||||
G4double totalFilledEnergyHcal = 0.0;
|
||||
#endif
|
||||
static G4int IDhcalE = -1;
|
||||
if (IDhcalE < 0)
|
||||
IDhcalE = man->GetH1Id("h100");
|
||||
@@ -222,30 +224,28 @@ void CCalEventAction::EndOfEventAction(const G4Event* evt){
|
||||
man->FillH1(IDhcalE+j,hcalE[j]);
|
||||
#ifdef debug
|
||||
G4cout << "Fill Hcal histo " << j << " with " << hcalE[j] << G4endl;
|
||||
#endif
|
||||
totalFilledEnergyHcal += hcalE[j];
|
||||
#endif
|
||||
}
|
||||
#ifdef debug
|
||||
G4cout <<
|
||||
"CCalAnalysis::InsertEnergyHcal: Total filled Energy Hcal histo "
|
||||
<< totalFilledEnergyHcal << G4endl;
|
||||
G4cout << "CCalAnalysis::InsertEnergyHcal: Total filled Energy Hcal histo "
|
||||
<< totalFilledEnergyHcal << G4endl;
|
||||
totalFilledEnergyEcal = 0.0;
|
||||
#endif
|
||||
|
||||
//3)
|
||||
static G4int IDecalE = -1;
|
||||
if (IDecalE < 0)
|
||||
IDecalE = man->GetH1Id("h200");
|
||||
G4double totalFilledEnergyEcal = 0.0;
|
||||
//3)
|
||||
static G4int IDecalE = -1;
|
||||
if (IDecalE < 0)
|
||||
IDecalE = man->GetH1Id("h200");
|
||||
for (G4int j=0; j<49; j++) {
|
||||
man->FillH1(IDecalE+j,ecalE[j]);
|
||||
#ifdef debug
|
||||
G4cout << "Fill Ecal histo " << j << " with " << ecalE[j] << G4endl;
|
||||
#endif
|
||||
totalFilledEnergyEcal += ecalE[j];
|
||||
#endif
|
||||
}
|
||||
#ifdef debug
|
||||
G4cout <<
|
||||
"CCalAnalysis::InsertEnergyEal: Total filled Energy Ecal histo "
|
||||
G4cout << "CCalAnalysis::InsertEnergyEal: Total filled Energy Ecal histo "
|
||||
<< totalFilledEnergyEcal << G4endl;
|
||||
#endif
|
||||
// 4)
|
||||
|
||||
@@ -85,8 +85,9 @@ void CCalSteppingAction::UserSteppingAction(const G4Step* aStep)
|
||||
void CCalSteppingAction::endOfEvent(){
|
||||
|
||||
G4AnalysisManager* man = G4AnalysisManager::Instance();
|
||||
#ifdef debug
|
||||
G4double totalFilledProfileHcal = 0.0;
|
||||
|
||||
#endif
|
||||
static G4int IDlateralProfile = -1;
|
||||
if (IDlateralProfile < 0) {
|
||||
IDlateralProfile = man->GetH1Id("h500");
|
||||
@@ -95,8 +96,8 @@ void CCalSteppingAction::endOfEvent(){
|
||||
man->FillH1(IDlateralProfile+i,LateralProfile[i]);
|
||||
#ifdef debug
|
||||
G4cout << "Fill Profile Hcal histo " << i << " with " << LateralProfile[i] << G4endl;
|
||||
#endif
|
||||
totalFilledProfileHcal += LateralProfile[i];
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef debug
|
||||
@@ -112,13 +113,15 @@ void CCalSteppingAction::endOfEvent(){
|
||||
if (IDTimeProfile < 0) {
|
||||
IDTimeProfile = man->GetH1Id("h901");
|
||||
}
|
||||
#ifdef debug
|
||||
G4double totalFilledTimeProfile = 0.0;
|
||||
#endif
|
||||
for (G4int j=0; j<timeHistoMaxBin; ++j) {
|
||||
man->FillH1(IDTimeHist+j,timeDeposit[j]);
|
||||
#ifdef debug
|
||||
G4cout << "Fill Time slice histo " << j << " with " << timeDeposit[j] << G4endl;
|
||||
#endif
|
||||
totalFilledTimeProfile += timeDeposit[j];
|
||||
#endif
|
||||
|
||||
G4double t = j + 0.5;
|
||||
man->FillH1(IDTimeProfile+1,t,timeDeposit[j]);
|
||||
|
||||
@@ -124,8 +124,9 @@ G4float CCaloOrganization::energyInMatrix(G4int nCellInEta, G4int nCellInPhi,
|
||||
|
||||
G4int det,z,eta,phi;
|
||||
this->unpackindex(crystalWithMaxEnergy, det, z, eta, phi);
|
||||
#ifdef debug
|
||||
G4int ncristals=0;
|
||||
|
||||
#endif
|
||||
G4int goBackInEta = nCellInEta/2;
|
||||
G4int goBackInPhi = nCellInPhi/2;
|
||||
G4int startEta = eta-goBackInEta;
|
||||
@@ -138,8 +139,8 @@ G4float CCaloOrganization::energyInMatrix(G4int nCellInEta, G4int nCellInPhi,
|
||||
|
||||
G4int index = this->packindex(det,z,ieta,iphi);
|
||||
totalEnergy += themap[index];
|
||||
ncristals+=1;
|
||||
#ifdef debug
|
||||
ncristals+=1;
|
||||
G4cout << "ieta - iphi - E = " << ieta << " " << iphi << " "
|
||||
<< themap[index] << G4endl;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user