Import Geant4 7.1.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.1 2002/12/04 02:44:27 morita Exp $
|
||||
# $Id: GNUmakefile,v 1.2 2005/04/22 16:26:46 gcosmo Exp $
|
||||
#
|
||||
# GNUmakefile: makefile for example ROOT I/O impelmentatoin.
|
||||
#
|
||||
@@ -19,8 +19,8 @@ include $(G4PEX_DIR)/config/G4PEXsetup.gmk
|
||||
|
||||
CPPFLAGS += -I$(G4INSTALL)/source/global/management/include \
|
||||
-I$(G4INSTALL)/source/global/HEPGeometry/include \
|
||||
-I$(G4INSTALL)/source/digits+hits/hits/include \
|
||||
-I$(G4INSTALL)/source/digits+hits/digits/include \
|
||||
-I$(G4INSTALL)/source/digits_hits/hits/include \
|
||||
-I$(G4INSTALL)/source/digits_hits/digits/include \
|
||||
-I$(G4INSTALL)/source/particles/management/include \
|
||||
-I$(G4INSTALL)/source/run/include \
|
||||
-I$(G4INSTALL)/source/event/include \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.4 2002/12/04 17:54:25 morita Exp $
|
||||
# $Id: binmake.gmk,v 1.7 2005/04/27 09:29:16 gcosmo Exp $
|
||||
# =====================================================================
|
||||
# binmake.gmk: GNUmakefile variables for creating the binary executable
|
||||
#
|
||||
@@ -140,7 +140,7 @@ endif
|
||||
ifneq ($(root_hh),)
|
||||
|
||||
include/%Root.hh include/%sRoot.hh include/%RootIO.hh src/%Root.cc src/%sRoot.cc src/%RootIO.cc: rootio/%.rootio
|
||||
$(G4ROOTIO) $<
|
||||
@$(G4ROOTIO) $<
|
||||
|
||||
$(root_dict): $(root_hh) $(root_def)
|
||||
ifdef CPPVERBOSE
|
||||
@@ -149,7 +149,7 @@ ifdef CPPVERBOSE
|
||||
$(PROG_ROOTCINT) -f $@ -c $(CINT_INCLUDES) -p $(root_tmp) )
|
||||
( cd $(G4PEX_TMP); rm -f $(root_tmp) )
|
||||
else
|
||||
@echo "Generating dictionary $(root_dict) ..."
|
||||
@echo "Generating dictionary ..."
|
||||
@cp -f $^ $(G4PEX_TMP)/
|
||||
@( cd $(G4PEX_TMP); \
|
||||
$(PROG_ROOTCINT) -f $@ -c $(CINT_INCLUDES) -p $(root_tmp) )
|
||||
@@ -157,12 +157,12 @@ else
|
||||
endif
|
||||
|
||||
$(root_def): $(root_hh)
|
||||
$(G4PEX_DIR)/config/rootdict.sh "$(root_name)" $(root_def)
|
||||
@$(G4PEX_DIR)/config/rootdict.sh "$(root_name)" $(root_def)
|
||||
|
||||
endif
|
||||
|
||||
$(root_dict_o): $(root_dict)
|
||||
@echo "Compiling $< with $(CXX) ..."
|
||||
@echo "Compiling dictionary with $(CXX) ..."
|
||||
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
|
||||
# ---------------------------------------------------------------------
|
||||
|
||||
@@ -182,7 +182,7 @@ $(G4PEX_TMP)/$(TARGET).o: $(TARGET).cc $(G4PEX_TMP)/$(TARGET).d
|
||||
ifdef CPPVERBOSE
|
||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
|
||||
else
|
||||
@echo "Compiling $< with $(CXX) ..."
|
||||
@echo "Compiling $(TARGET).cc with $(CXX) ..."
|
||||
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
|
||||
endif
|
||||
|
||||
@@ -196,7 +196,7 @@ endif
|
||||
|
||||
$(libraries_to_build): $(objects)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
@echo Creating shared library $@
|
||||
@echo Creating shared library lib$(TARGET).so ...
|
||||
@rm -f $(G4PEX_LIB)/lib$(TARGET).so
|
||||
@cd $(G4PEX_TMP); \
|
||||
$(CXX) -Wl,-soname,lib$(TARGET).so \
|
||||
@@ -204,9 +204,9 @@ ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
$(EXTLDFLAGS) $(EXTLIBS)
|
||||
endif
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
@echo Creating static library $@
|
||||
@echo Creating static library lib$(TARGET).a ...
|
||||
@rm -f $(G4PEX_LIB)/lib$(TARGET).a
|
||||
$(AR) $(G4PEX_LIB)/lib$(TARGET).a $(G4PEX_TMP)/*.o
|
||||
@$(AR) $(G4PEX_LIB)/lib$(TARGET).a $(G4PEX_TMP)/*.o
|
||||
@if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4PEX_LIB)/lib$(TARGET).a ;fi
|
||||
endif
|
||||
@@ -231,5 +231,5 @@ endif
|
||||
@rm -f -r $(G4PEX_DIR)/tmp/$(G4SYSTEM)/$(TARGET)
|
||||
|
||||
distclean: clean
|
||||
@rm -f G4defaultOutput G4run0001.root G4History.macro core* .DAWN*.history g4_*.prim
|
||||
@rm -f G4defaultOutput G4run0001.root Histo.root G4History.macro core* .DAWN*.history g4_*.prim
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: common.gmk,v 1.2 2002/12/04 09:39:24 morita Exp $
|
||||
# $Id: common.gmk,v 1.5 2005/04/23 15:44:02 gcosmo Exp $
|
||||
# =====================================================================
|
||||
# common.gmk: GNUmakefile variables for building the library files.
|
||||
#
|
||||
@@ -90,7 +90,7 @@ endif
|
||||
ifneq ($(root_hh),)
|
||||
|
||||
include/%Root.hh include/%sRoot.hh include/%RootIO.hh src/%Root.cc src/%sRoot.cc src/%RootIO.cc: rootio/%.rootio
|
||||
$(G4ROOTIO) $<
|
||||
@$(G4ROOTIO) $<
|
||||
|
||||
$(root_dict): $(root_hh) $(root_def)
|
||||
ifdef CPPVERBOSE
|
||||
@@ -99,7 +99,7 @@ ifdef CPPVERBOSE
|
||||
$(PROG_ROOTCINT) -f $@ -c $(CINT_INCLUDES) -p $(root_tmp) )
|
||||
( cd $(G4PEX_TMP); rm -f $(root_tmp) )
|
||||
else
|
||||
@echo "Generating dictionary $(root_dict) ..."
|
||||
@echo "Generating dictionary ..."
|
||||
@cp -f $^ $(G4PEX_TMP)/
|
||||
@( cd $(G4PEX_TMP); \
|
||||
$(PROG_ROOTCINT) -f $@ -c $(CINT_INCLUDES) -p $(root_tmp) )
|
||||
@@ -107,19 +107,19 @@ else
|
||||
endif
|
||||
|
||||
$(root_def): $(root_hh)
|
||||
$(G4PEX_DIR)/config/rootdict.sh "$(root_name)" $(root_def)
|
||||
@$(G4PEX_DIR)/config/rootdict.sh "$(root_name)" $(root_def)
|
||||
|
||||
endif
|
||||
|
||||
$(root_dict_o): $(root_dict)
|
||||
@echo "Compiling $< with $(CXX) ..."
|
||||
@echo "Compiling dictionary with $(CXX) ..."
|
||||
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
|
||||
|
||||
# ---------------------------------------------------------------------
|
||||
|
||||
$(libraries_to_build): $(objects)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
@echo Creating shared library $@
|
||||
@echo Creating shared library lib$(TARGET).so ...
|
||||
@rm -f $(G4PEX_LIB)/lib$(TARGET).so
|
||||
@cd $(G4PEX_TMP); \
|
||||
$(CXX) -Wl,-soname,lib$(TARGET).so \
|
||||
@@ -127,9 +127,9 @@ ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
$(EXTLDFLAGS) $(EXTLIBS)
|
||||
endif
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
@echo Creating static library $@
|
||||
@echo Creating static library lib$(TARGET).a ...
|
||||
@rm -f $(G4PEX_LIB)/lib$(TARGET).a
|
||||
$(AR) $(G4PEX_LIB)/lib$(TARGET).a $(G4PEX_TMP)/*.o
|
||||
@$(AR) $(G4PEX_LIB)/lib$(TARGET).a $(G4PEX_TMP)/*.o
|
||||
@if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4PEX_LIB)/lib$(TARGET).a ;fi
|
||||
endif
|
||||
@@ -152,6 +152,13 @@ ifneq ($(cleanup_target),)
|
||||
endif
|
||||
@rm -f -r $(G4PEX_DIR)/lib/$(G4SYSTEM)/$(libraries_to_build)
|
||||
@rm -f -r $(G4PEX_DIR)/tmp/$(G4SYSTEM)/$(TARGET)
|
||||
@rm -f -r $(G4PEX_DIR)/include/G4ROOTIOLinkDef.h
|
||||
|
||||
distclean:
|
||||
@rm -f -r $(G4PEX_DIR)/lib
|
||||
@rm -f -r $(G4PEX_DIR)/tmp
|
||||
@rm -f -r $(G4PEX_DIR)/bin
|
||||
@rm -f -r $(G4PEX_DIR)/include/G4ROOTIOLinkDef.h
|
||||
|
||||
test:
|
||||
@echo "objects = $(objects)"
|
||||
|
||||
@@ -2108,7 +2108,7 @@ sub fads_create_io_source_file{
|
||||
print(OUT " branch->SetAutoDelete(kFALSE);\n");
|
||||
print(OUT "\n");
|
||||
print(OUT " if ( m_verbose > 2 ) {\n");
|
||||
print(OUT " G4cout << \"${class_io}: Storing ${class_name} collectoin \"\n");
|
||||
print(OUT " G4cout << \"${class_io}: Storing ${class_name} collection \"\n");
|
||||
print(OUT " << \"for \\\"\" << ahc->GetSDname() << \"\\\", \"\n");
|
||||
print(OUT " << \"collection \\\"\" << ahc->GetName() << \"\\\".\" << G4endl\n");
|
||||
print(OUT " << \" # of entries: \" << ahc->$collection_class_method_entries << \".\" << G4endl;\n");
|
||||
@@ -2154,7 +2154,7 @@ sub fads_create_io_source_file{
|
||||
print(OUT " branch->SetAddress(&f_hc);\n");
|
||||
print(OUT "\n");
|
||||
print(OUT " if ( m_verbose > 2 ) {\n");
|
||||
print(OUT " G4cout << \"${class_io}: Retrieving ${class_name} collectoin \"\n");
|
||||
print(OUT " G4cout << \"${class_io}: Retrieving ${class_name} collection \"\n");
|
||||
print(OUT " << \"for \\\"\" << f_detName << \"\\\", \"\n");
|
||||
print(OUT " << \"collection \\\"\" << f_colName << \"\\\".\" << G4endl;\n");
|
||||
print(OUT " }\n");
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4DigitRootIO.hh,v 1.4 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4DigitRootIO.hh
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4EventRootIO.hh,v 1.3 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4EventRootIO.hh
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HepMCRootIO.hh,v 1.3 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4HepMCRootIO.hh
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HitRootIO.hh,v 1.4 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4HitRootIO.hh
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MCTruthRootIO.hh,v 1.4 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4MCTruthRootIO.hh
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4RootEvent.hh,v 1.3 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4RootEvent.hh
|
||||
//
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4RootIOManager.hh,v 1.3 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4RootIOManager.hh
|
||||
//
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4RootTransManager.hh,v 1.3 2002/12/13 14:45:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// $Id: G4RootTransManager.hh,v 1.4 2005/04/22 16:57:04 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4RootTransManager.hh
|
||||
//
|
||||
@@ -109,7 +109,7 @@ class G4RootTransManager
|
||||
// Sets the ROOT I/O compression level.
|
||||
|
||||
private:
|
||||
TFile* LookUp(string file, string mode);
|
||||
TFile* LookUp(std::string file, std::string mode);
|
||||
// Returns the Root file pointer to the object type and file name.
|
||||
// Opens a new file if the access is for the first time.
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4DigitRootIO.cc,v 1.4 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// $Id: G4DigitRootIO.cc,v 1.5 2005/04/22 16:26:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4DigitRootIO.cc
|
||||
//
|
||||
@@ -51,13 +51,13 @@ G4DigitRootIO* G4DigitRootIO::GetDigitRootIO()
|
||||
}
|
||||
|
||||
// Implementation of Store
|
||||
bool G4DigitRootIO::Store(const G4DCofThisEvent* dcevt)
|
||||
bool G4DigitRootIO::Store(const G4DCofThisEvent*)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
// Implementation of Retrieve
|
||||
bool G4DigitRootIO::Retrieve(G4DCofThisEvent*& dcevt)
|
||||
bool G4DigitRootIO::Retrieve(G4DCofThisEvent*&)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4EventRootIO.cc,v 1.3 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// $Id: G4EventRootIO.cc,v 1.4 2005/04/22 16:26:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4EventRootIO.cc
|
||||
//
|
||||
@@ -41,8 +41,8 @@ G4EventRootIO::G4EventRootIO( G4PersistencyManager* pc )
|
||||
}
|
||||
|
||||
// Implementation of Store
|
||||
// G4bool G4EventRootIO::Store( HepMC::GenEvent* hepevt, G4MCTEvent* mctevt, const G4Event* g4evt)
|
||||
G4bool G4EventRootIO::Store( HepMC::GenEvent* hepevt, const G4Event* g4evt)
|
||||
// G4bool G4EventRootIO::Store( HepMC::GenEvent* hepevt, const G4Event* g4evt)
|
||||
G4bool G4EventRootIO::Store( HepMC::GenEvent*, const G4Event*)
|
||||
{
|
||||
// if (hepevt == 0) return false; // no event generated...
|
||||
|
||||
@@ -52,19 +52,19 @@ G4bool G4EventRootIO::Store( HepMC::GenEvent* hepevt, const G4Event* g4evt)
|
||||
}
|
||||
|
||||
// Implementation of Store
|
||||
G4bool G4EventRootIO::Store( const G4Event* anEvent )
|
||||
G4bool G4EventRootIO::Store( const G4Event* )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
// Implementation of Retrieve
|
||||
G4bool G4EventRootIO::Retrieve( G4Pevent*& anEvent )
|
||||
G4bool G4EventRootIO::Retrieve( G4Pevent*& )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
// Implementation of Retrieve
|
||||
G4bool G4EventRootIO::Retrieve( G4Event*& anEvent )
|
||||
G4bool G4EventRootIO::Retrieve( G4Event*& )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HepMCRootIO.cc,v 1.4 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// $Id: G4HepMCRootIO.cc,v 1.5 2005/04/22 16:26:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4HepMCRootIO.cc
|
||||
//
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "G4HepMCRootIO.hh"
|
||||
|
||||
// Implementation of Store
|
||||
bool G4HepMCRootIO::Store(HepMC::GenEvent* evt)
|
||||
bool G4HepMCRootIO::Store(HepMC::GenEvent*)
|
||||
{
|
||||
// G4RootIOManager* pm =
|
||||
// (G4RootIOManager*) G4PersistencyCenter::GetPersistencyCenter()
|
||||
@@ -43,7 +43,7 @@ bool G4HepMCRootIO::Store(HepMC::GenEvent* evt)
|
||||
}
|
||||
|
||||
// Implementation of Retrieve
|
||||
bool G4HepMCRootIO::Retrieve(HepMC::GenEvent*& evt, int id)
|
||||
bool G4HepMCRootIO::Retrieve(HepMC::GenEvent*& evt, int)
|
||||
{
|
||||
// bool st = false;
|
||||
evt = 0;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HitRootIO.cc,v 1.4 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4HitRootIO.cc
|
||||
//
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MCTruthRootIO.cc,v 1.4 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// $Id: G4MCTruthRootIO.cc,v 1.5 2005/04/22 16:26:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4MCTruthRootIO.cc
|
||||
//
|
||||
@@ -33,13 +33,13 @@
|
||||
G4MCTruthRootIO* G4MCTruthRootIO::thePointer=G4MCTruthRootIO::GetMCTruthRootIO();
|
||||
|
||||
// Implementation of Store
|
||||
bool G4MCTruthRootIO::Store(G4MCTEvent* mctevent)
|
||||
bool G4MCTruthRootIO::Store(G4MCTEvent*)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
// Implementation of Retrieve
|
||||
bool G4MCTruthRootIO::Retrieve(G4MCTEvent* & mctevent)
|
||||
bool G4MCTruthRootIO::Retrieve(G4MCTEvent* &)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4RootEvent.cc,v 1.3 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// $Id: G4RootEvent.cc,v 1.4 2005/04/22 16:26:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4RootEvent.cc
|
||||
//
|
||||
@@ -46,7 +46,7 @@ G4RootEvent::~G4RootEvent()
|
||||
G4Pevent* G4RootEvent::MakeTransientObject()
|
||||
{
|
||||
HepMC::GenEvent* hepevt = 0;
|
||||
G4MCTEvent* mctevt = 0;
|
||||
// G4MCTEvent* mctevt = 0;
|
||||
G4Event* g4evt = 0;
|
||||
// G4Pevent* anEvt = new G4Pevent(hepevt, mctevt, g4evt);
|
||||
G4Pevent* anEvt = new G4Pevent(hepevt, g4evt);
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4RootIOManager.cc,v 1.4 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4RootIOManager.cc
|
||||
//
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4RootTransManager.cc,v 1.4 2002/12/13 14:45:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
// $Id: G4RootTransManager.cc,v 1.5 2005/04/22 16:26:47 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
//
|
||||
// File: G4RootTransManager.cc
|
||||
//
|
||||
@@ -44,7 +44,7 @@ G4RootTransManager::G4RootTransManager()
|
||||
}
|
||||
|
||||
// Implementation of SelectReadFile
|
||||
bool G4RootTransManager::SelectReadFile(std::string obj, std::string file)
|
||||
bool G4RootTransManager::SelectReadFile(std::string, std::string file)
|
||||
{
|
||||
// obtain TFile pointer for "file" for reading
|
||||
TFile* tfile = LookUp(file, "READ");
|
||||
@@ -65,7 +65,7 @@ bool G4RootTransManager::SelectReadFile(std::string obj, std::string file)
|
||||
}
|
||||
|
||||
// Implementation of SelectWriteFile
|
||||
bool G4RootTransManager::SelectWriteFile(std::string obj, std::string file)
|
||||
bool G4RootTransManager::SelectWriteFile(std::string, std::string file)
|
||||
{
|
||||
// obtain TFile pointer for "obj" and "file" for writing
|
||||
TFile* tfile = LookUp(file, "WRITE");
|
||||
@@ -120,7 +120,7 @@ int G4RootTransManager::BufferSize()
|
||||
}
|
||||
|
||||
// Implementation of LookUp
|
||||
TFile* G4RootTransManager::LookUp(string file, string mode)
|
||||
TFile* G4RootTransManager::LookUp(std::string file, std::string mode)
|
||||
{
|
||||
if ( (*(f_catalog.find(file))).second != 0 ) {
|
||||
return f_catalog[file];
|
||||
@@ -128,16 +128,16 @@ TFile* G4RootTransManager::LookUp(string file, string mode)
|
||||
if ( mode == "WRITE" ) {
|
||||
f_catalog[file] = new TFile(file.c_str(), "UPDATE");
|
||||
|
||||
cout << "LookUp: File: " << file << " for write" << endl;
|
||||
G4cout << "LookUp: File: " << file << " for write" << G4endl;
|
||||
f_catalog[file]->SetCompressionLevel(f_comp);
|
||||
return f_catalog[file];
|
||||
} else if ( mode == "READ" ) {
|
||||
f_catalog[file] = new TFile(file.c_str(), "READ");
|
||||
|
||||
cout << "LookUp: File: " << file << " for read" << endl;
|
||||
G4cout << "LookUp: File: " << file << " for read" << G4endl;
|
||||
return f_catalog[file];
|
||||
} else {
|
||||
cout << "LookUp: File: " << file << ", f_catalog=0" << endl;
|
||||
G4cout << "LookUp: File: " << file << ", f_catalog=0" << G4endl;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user