Import Geant4 6.2.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.5 2003/12/08 17:53:26 gcosmo Exp $
|
||||
# $Id: GNUmakefile,v 1.6 2004/06/09 15:04:37 daquinog Exp $
|
||||
# --------------------------------------------------------------
|
||||
# GNUmakefile Michael Dressel
|
||||
# --------------------------------------------------------------
|
||||
@@ -27,9 +27,11 @@ all: lib bin
|
||||
include $(G4INSTALL)/config/binmake.gmk
|
||||
|
||||
ifdef G4ANALYSIS_USE
|
||||
CPPFLAGS += `$(ANAPHE_SCRIPTS)/aida-config -i`
|
||||
CPPFLAGS += `aida-config --include`
|
||||
# LDFLAGS += `aida-config --lib`
|
||||
endif
|
||||
|
||||
|
||||
CPPFLAGS += -I$(PYTHON_INCLUDE_DIR) \
|
||||
-I$(TIARA_BASE)/source/tiaraPhysicsPackaging/include \
|
||||
-I$(TIARA_BASE)/source/tiaraPhysicsLists/include
|
||||
@@ -37,7 +39,7 @@ CPPFLAGS += -I$(PYTHON_INCLUDE_DIR) \
|
||||
LDFLAGS += -L$(PYTHON_LIB_DIR)
|
||||
|
||||
ifdef G4ANALYSIS_USE
|
||||
LDLIBS += `$(ANAPHE_SCRIPTS)/aida-config -l`
|
||||
LDLIBS += `aida-config --lib`
|
||||
endif
|
||||
|
||||
LDLIBS += -lpython$(PYTHONVERSION) \
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDPSSampledEnergy.hh,v 1.5 2003/06/25 09:12:37 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// $Id: TiaraDPSSampledEnergy.hh,v 1.6 2004/06/09 15:04:37 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-06-02 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
//
|
||||
@@ -61,8 +61,13 @@ private:
|
||||
|
||||
void getBounds(G4int &cL, G4int &cH, G4double v);
|
||||
|
||||
std::auto_ptr<AIDA::ITree> fTree;
|
||||
std::auto_ptr<AIDA::IDataPointSet> fSampleDPS;
|
||||
//std::auto_ptr<AIDA::ITree> fTree;
|
||||
// std::auto_ptr<AIDA::IDataPointSet> fSampleDPS;
|
||||
// /////
|
||||
AIDA::ITree* fTree;
|
||||
AIDA::IDataPointSet* fSampleDPS;
|
||||
//////
|
||||
|
||||
G4double fMinEnergyCut;
|
||||
std::map<int, double> fEnergy_Flux;
|
||||
G4double fMaxProb;
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: TiaraCellScorer.cc,v 1.3 2003/06/18 16:40:28 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02-patch-01 $
|
||||
// $Id: TiaraCellScorer.cc,v 1.4 2004/06/09 15:04:37 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-06-02 $
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
@@ -48,22 +48,37 @@ TiaraCellScorer::TiaraCellScorer(AIDA::IHistogramFactory *hf,
|
||||
&binEdgesBonner,
|
||||
const TiaraTally &tally) :
|
||||
fBaseName(histBaseName),
|
||||
fEnergyHisto(hf->createHistogram1D(histBaseName,
|
||||
histBaseName + ": flux vs. energy",
|
||||
binEdgesScinti)),
|
||||
fEnergyFluxHisto(hf->createHistogram1D(histBaseName + "Eflux",
|
||||
histBaseName + ": energy flux vs. energy",
|
||||
binEdgesScinti)),
|
||||
// fEnergyHisto(hf->createHistogram1D(histBaseName,
|
||||
// histBaseName + ": flux vs. energy",
|
||||
// binEdgesScinti)),
|
||||
//fEnergyFluxHisto(hf->createHistogram1D(histBaseName + "Eflux",
|
||||
// histBaseName + ": energy flux vs. energy",
|
||||
// binEdgesScinti)),
|
||||
|
||||
fEnergyHistoBonner(hf->createHistogram1D(histBaseName + "Bonner",
|
||||
histBaseName + ": flux vs. energy",
|
||||
binEdgesBonner)),
|
||||
fEnergyFluxHistoBonner(hf->createHistogram1D(histBaseName + "BonnerEflux",
|
||||
histBaseName + ": energy flux vs. energy",
|
||||
binEdgesBonner)),
|
||||
//fEnergyHistoBonner(hf->createHistogram1D(histBaseName + "Bonner",
|
||||
// histBaseName + ": flux vs. energy",
|
||||
// binEdgesBonner)),
|
||||
//fEnergyFluxHistoBonner(hf->createHistogram1D(histBaseName + "BonnerEflux",
|
||||
// histBaseName + ": energy flux vs. energy",
|
||||
// binEdgesBonner)),
|
||||
|
||||
fTally(tally)
|
||||
{}
|
||||
{
|
||||
//G4cout << "porca troia" << G4endl;
|
||||
G4cout << hf << " hf in G4" << G4endl;
|
||||
fEnergyHisto = hf->createHistogram1D(histBaseName,
|
||||
histBaseName + ": flux vs. energy",
|
||||
binEdgesScinti);
|
||||
fEnergyFluxHisto = hf->createHistogram1D(histBaseName + "Eflux",
|
||||
histBaseName + ": energy flux vs. energy",
|
||||
binEdgesScinti);
|
||||
fEnergyHistoBonner = hf->createHistogram1D(histBaseName + "Bonner",
|
||||
histBaseName + ": flux vs. energy",
|
||||
binEdgesBonner);
|
||||
fEnergyFluxHistoBonner = hf->createHistogram1D(histBaseName + "BonnerEflux",
|
||||
histBaseName + ": energy flux vs. energy",
|
||||
binEdgesBonner);
|
||||
}
|
||||
#else
|
||||
TiaraCellScorer::TiaraCellScorer(const G4String &histBaseName,
|
||||
const TiaraTally &tally) :
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: TiaraDPSSampledEnergy.cc,v 1.7 2003/12/08 17:53:27 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// $Id: TiaraDPSSampledEnergy.cc,v 1.8 2004/06/09 15:04:37 daquinog Exp $
|
||||
// GEANT4 tag $Name: geant4-06-02 $
|
||||
//
|
||||
|
||||
#include "TiaraDPSSampledEnergy.hh"
|
||||
@@ -40,16 +40,34 @@ TiaraDPSSampledEnergy::TiaraDPSSampledEnergy(const G4String &eng,
|
||||
const G4String &sourceTree,
|
||||
const G4String &nameExt)
|
||||
:
|
||||
fTree( (checkFileIsReadable(sourceTree, "TiaraDPSSampledEnergy::TiaraDPSSampledEnergy"),
|
||||
AIDA_createAnalysisFactory()
|
||||
->createTreeFactory()
|
||||
->create(sourceTree, "xml",true,false)) ),
|
||||
fSampleDPS(dynamic_cast<AIDA::IDataPointSet *>(fTree->find(G4String("dps" + eng + nameExt)))),
|
||||
// fTree( (checkFileIsReadable(sourceTree, "TiaraDPSSampledEnergy::TiaraDPSSampledEnergy"),
|
||||
// AIDA_createAnalysisFactory()
|
||||
// ->createTreeFactory()
|
||||
// ->create(sourceTree, "xml",true,false)) ),
|
||||
//fSampleDPS(dynamic_cast<AIDA::IDataPointSet *>(fTree->find(G4String("dps" + eng + nameExt)))),
|
||||
fMinEnergyCut(minEnergyCut),
|
||||
fMaxProb(0),
|
||||
fMinE(fSampleDPS->point(0)->coordinate(0)->value()),
|
||||
fMaxE(fSampleDPS->point(fSampleDPS->size()-1)->coordinate(0)->value())
|
||||
fMaxProb(0)
|
||||
// fMinE(fSampleDPS->point(0)->coordinate(0)->value()),
|
||||
//fMaxE(fSampleDPS->point(fSampleDPS->size()-1)->coordinate(0)->value())
|
||||
{
|
||||
/////////////////////////////////////////
|
||||
|
||||
AIDA::IAnalysisFactory* aFact = AIDA_createAnalysisFactory();
|
||||
|
||||
AIDA::ITreeFactory *treeFact = aFact->createTreeFactory();
|
||||
|
||||
fTree = treeFact -> create(sourceTree, "xml",true,false);
|
||||
|
||||
AIDA::IManagedObject* object = fTree->find("dps" + eng + nameExt);
|
||||
if(object) {
|
||||
AIDA::IDataPointSet* sample = object->cast("AIDA::IDataPointSet");
|
||||
fSampleDPS = sample;
|
||||
}
|
||||
fMinE = fSampleDPS->point(0)->coordinate(0)->value();
|
||||
fMaxE = fSampleDPS->point(fSampleDPS->size()-1)->coordinate(0)->value();
|
||||
|
||||
/////////////////////////////////////////
|
||||
|
||||
for (G4int i=0; i < fSampleDPS->size(); i++) {
|
||||
AIDA::IDataPoint *p = fSampleDPS->point(i);
|
||||
G4double prob(p->coordinate(1)->value());
|
||||
|
||||
Reference in New Issue
Block a user