 |
 |
| Commit in slic on MAIN | |||
| include/Module.hh | +2 | -2 | 1.10 -> 1.11 |
| /TrajectoryManager.hh | +3 | -3 | 1.31 -> 1.32 |
| src/EventMessenger.cc | +2 | -2 | 1.3 -> 1.4 |
| /EventSourceManager.cc | +3 | -3 | 1.21 -> 1.22 |
| /EventSourceWithInputFile.cc | +2 | -2 | 1.8 -> 1.9 |
| /FieldMessenger.cc | +2 | -2 | 1.7 -> 1.8 |
| /G4MagIntegratorStepperFactory.cc | +1 | -7 | 1.6 -> 1.7 |
| /GeneratorMessenger.cc | +2 | -2 | 1.15 -> 1.16 |
| /LcioEventSource.cc | +3 | -3 | 1.7 -> 1.8 |
| /LcioHitsCollectionBuilder.cc | +4 | -5 | 1.21 -> 1.22 |
| /LcioManager.cc | +4 | -4 | 1.86 -> 1.87 |
| /LcioMcpFactory.cc | +7 | -7 | 1.21 -> 1.22 |
| /LcioMcpManager.cc | +4 | -4 | 1.69 -> 1.70 |
| /LcioMcpMessenger.cc | +2 | -2 | 1.11 -> 1.12 |
| /LcioMessenger.cc | +3 | -3 | 1.35 -> 1.36 |
| /LcioPrimaryGenerator.cc | +2 | -2 | 1.38 -> 1.39 |
| /PhysicsListFactory.cc | +2 | -2 | 1.29 -> 1.30 |
| /PhysicsListManager.cc | +2 | -2 | 1.26 -> 1.27 |
| /RunManager.cc | +2 | -2 | 1.17 -> 1.18 |
| /StdHepLoader.cc | +3 | -3 | 1.20 -> 1.21 |
| /StdHepToLcioConvertor.cc | +3 | -3 | 1.40 -> 1.41 |
| /TrajectoryManager.cc | +2 | -2 | 1.50 -> 1.51 |
| +60 | -67 | ||
change G4Exception calls to make compatible with G4 9.5
diff -u -r1.10 -r1.11 --- Module.hh 26 Jul 2010 20:41:18 -0000 1.10 +++ Module.hh 31 Jan 2012 18:52:30 -0000 1.11 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/Module.hh,v 1.10 2010/07/26 20:41:18 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/Module.hh,v 1.11 2012/01/31 18:52:30 jeremy Exp $
#ifndef SLIC_MODULE_HH #define SLIC_MODULE_HH 1
@@ -100,7 +100,7 @@
G4ClassificationOfNewTrack stackingClassifyNewTrack( const G4Track* )
{
- G4Exception("This method should never be called. Please override it.");
+ G4Exception("", "", FatalException, "This method should be overridden.");
// Arbitrary return value. Will never reach here.
return fWaiting;
}
diff -u -r1.31 -r1.32 --- TrajectoryManager.hh 15 Oct 2009 00:07:49 -0000 1.31 +++ TrajectoryManager.hh 31 Jan 2012 18:52:30 -0000 1.32 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/TrajectoryManager.hh,v 1.31 2009/10/15 00:07:49 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/TrajectoryManager.hh,v 1.32 2012/01/31 18:52:30 jeremy Exp $
#ifndef SLIC_TRAJECTORYMANAGER_HH #define SLIC_TRAJECTORYMANAGER_HH 1
@@ -201,7 +201,7 @@
{
// check null trajectory
if (!trj ) {
- G4Exception("TrajectoryManager::getTrajectoryPointPosition() - Trajectory argument is NULL!");
+ G4Exception("TrajectoryManager::getTrajectoryPointPosition()", "", FatalException, "Trajectory is null.");
}
// get number of trajectories
@@ -209,7 +209,7 @@
// check idx argument against number of trajectories
if ( ( pos_idx > ( numPnts - 1 ) ) || pos_idx < 0 ) {
- G4Exception("TrajectoryManager::getTrajectoryPointPosition() - Invalid trajectory position idx.");
+ G4Exception("TrajectoryManager::getTrajectoryPointPosition()", "", FatalException, "The trajectory position index is invalid.");
}
// return point at idx
diff -u -r1.3 -r1.4 --- EventMessenger.cc 19 Oct 2005 22:51:15 -0000 1.3 +++ EventMessenger.cc 31 Jan 2012 18:52:30 -0000 1.4 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/EventMessenger.cc,v 1.3 2005/10/19 22:51:15 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/EventMessenger.cc,v 1.4 2012/01/31 18:52:30 jeremy Exp $
#include "EventMessenger.hh" // slic
@@ -29,7 +29,7 @@
EventAction::getEventAction()->enableEventTimer( et );
}
else {
- G4Exception("Unknown command for this messenger.");
+ G4Exception("", "", JustWarning, "Unknown command for this messenger.");
} }
diff -u -r1.21 -r1.22 --- EventSourceManager.cc 8 Jan 2010 23:18:56 -0000 1.21 +++ EventSourceManager.cc 31 Jan 2012 18:52:30 -0000 1.22 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/EventSourceManager.cc,v 1.21 2010/01/08 23:18:56 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/EventSourceManager.cc,v 1.22 2012/01/31 18:52:30 jeremy Exp $
#include "EventSourceManager.hh" // slic
@@ -275,7 +275,7 @@
}
else
{
- G4Exception("Event Source type is unknown.");
+ G4Exception("", "", JustWarning, "Event Source type is unknown.");
}
}
@@ -356,7 +356,7 @@
}
else
{
- G4Exception("Cast to EventSourceWithInputFile failed!");
+ G4Exception("", "", JustWarning, "Cast to EventSourceWithInputFile failed.");
}
}
return eof;
diff -u -r1.8 -r1.9 --- EventSourceWithInputFile.cc 27 Apr 2007 01:54:34 -0000 1.8 +++ EventSourceWithInputFile.cc 31 Jan 2012 18:52:30 -0000 1.9 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/EventSourceWithInputFile.cc,v 1.8 2007/04/27 01:54:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/EventSourceWithInputFile.cc,v 1.9 2012/01/31 18:52:30 jeremy Exp $
#include "EventSourceWithInputFile.hh" // slic
@@ -81,7 +81,7 @@
// check if filename is setup correctly
if ( !m_fileIsSet ) {
- G4Exception("Generator filename was not set.");
+ G4Exception("", "", FatalException, "Generator filename was not set.");
}
// reset if new file
diff -u -r1.7 -r1.8 --- FieldMessenger.cc 27 Apr 2007 01:54:34 -0000 1.7 +++ FieldMessenger.cc 31 Jan 2012 18:52:30 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/FieldMessenger.cc,v 1.7 2007/04/27 01:54:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/FieldMessenger.cc,v 1.8 2012/01/31 18:52:30 jeremy Exp $
#include "FieldMessenger.hh" // slic
@@ -51,7 +51,7 @@
m_mgr->log() << LOG::okay << "delta intersection <" << deltaIntersection << ">" << LOG::done;
}
else {
- G4Exception("Unknown command " + cmd->GetCommandName() );
+ G4Exception("", "", JustWarning, "Unknown command.");
} }
diff -u -r1.6 -r1.7 --- G4MagIntegratorStepperFactory.cc 27 Apr 2007 01:54:34 -0000 1.6 +++ G4MagIntegratorStepperFactory.cc 31 Jan 2012 18:52:30 -0000 1.7 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/G4MagIntegratorStepperFactory.cc,v 1.6 2007/04/27 01:54:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4MagIntegratorStepperFactory.cc,v 1.7 2012/01/31 18:52:30 jeremy Exp $
#include "G4MagIntegratorStepperFactory.hh" // G4
@@ -28,13 +28,7 @@
: Module( "G4MagIntegratorStepperFactory" )
{
m_fieldMgr = G4TransportationManager::GetTransportationManager()->GetFieldManager();
-
- if ( m_fieldMgr == 0 ) {
- G4Exception("G4FieldManager is null.");
- }
-
m_field = static_cast<G4MagneticField*>(const_cast<G4Field*>(m_fieldMgr->GetDetectorField()));
-
if ( m_field == 0 ) {
log() << LOG::error << "Command refused. Detector has no G4MagneticField." << LOG::done;
}
diff -u -r1.15 -r1.16 --- GeneratorMessenger.cc 26 Jul 2010 18:40:23 -0000 1.15 +++ GeneratorMessenger.cc 31 Jan 2012 18:52:30 -0000 1.16 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.15 2010/07/26 18:40:23 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.16 2012/01/31 18:52:30 jeremy Exp $
#include "GeneratorMessenger.hh" // slic
@@ -98,7 +98,7 @@
EventSourceManager::instance()->setLorentzTransformationAngle(G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(newVals));
}
else {
- G4Exception("Unknown cmd for this messenger.");
+ G4Exception("", "", JustWarning, "Unknown command.");
}
}
diff -u -r1.7 -r1.8 --- LcioEventSource.cc 27 Apr 2007 01:54:34 -0000 1.7 +++ LcioEventSource.cc 31 Jan 2012 18:52:30 -0000 1.8 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioEventSource.cc,v 1.7 2007/04/27 01:54:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioEventSource.cc,v 1.8 2012/01/31 18:52:30 jeremy Exp $
#include "LcioEventSource.hh" // slic
@@ -33,7 +33,7 @@
}
catch (IO::IOException& ioe) {
log() << LOG::error << ioe.what() << LOG::done;
- G4Exception("ERROR: Caught exception while reading LCIO input file.");
+ G4Exception("", "", FatalException, "Caught exception while reading LCIO input file.");
} }
@@ -99,7 +99,7 @@
mcpColl = LcioMcpManager::instance()->findMcpCollection( m_event );
if ( mcpColl == 0 ) {
- G4Exception("FATAL ERROR: No Mcp collection found in LCIO input event.");
+ G4Exception("", "", FatalException, "No Mcp collection found in LCIO input event.");
}
}
else {
diff -u -r1.21 -r1.22 --- LcioHitsCollectionBuilder.cc 1 Sep 2011 21:13:09 -0000 1.21 +++ LcioHitsCollectionBuilder.cc 31 Jan 2012 18:52:30 -0000 1.22 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.21 2011/09/01 21:13:09 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioHitsCollectionBuilder.cc,v 1.22 2012/01/31 18:52:30 jeremy Exp $
// SLIC #include "LcioHitsCollectionBuilder.hh"
@@ -136,8 +136,7 @@
else
{
- G4Exception( - "LcioHitsCollectionBuilder::createHitCollections() - No collection found for Hits Collection ID");
+ G4Exception("LcioHitsCollectionBuilder::createHitCollections()", "", FatalException, "No collection found for Hits Collection ID");
}
}
}
@@ -164,7 +163,7 @@
// unknown type of hit
else
{
- G4Exception("Unknown HC type.");
+ G4Exception("", "", FatalException, "Unknown HC type.");
}
return collVec;
@@ -299,7 +298,7 @@
{
log() << LOG::debug << "g4 hit E: " << totE << LOG::done;
log() << LOG::debug << "sim hit E: " << simCalHit->getEnergy() << LOG::done;
- G4Exception("LCIO simCalHit E != G4 CalHit E, within tolerance");
+ G4Exception("", "", JustWarning, "LCIO simCalHit E != G4 CalHit E, within tolerance");
} #endif
diff -u -r1.86 -r1.87 --- LcioManager.cc 31 May 2011 16:41:06 -0000 1.86 +++ LcioManager.cc 31 Jan 2012 18:52:30 -0000 1.87 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.86 2011/05/31 16:41:06 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.87 2012/01/31 18:52:30 jeremy Exp $
#include "LcioManager.hh" // slic
@@ -116,8 +116,8 @@
else if ( m_fileExistsAction == eDelete ) {
if ( FileUtil::removeFile( fullFilename ) != 0 ) {
// Fatal error. File could not be removed.
- log().fatal("Unable to delete old LCIO file <" + fullFilename + ">");
- G4Exception("Unable to delete old LCIO file.");
+ //log().fatal("Unable to delete old LCIO file <" + fullFilename + ">");
+ G4Exception("", "", FatalException, "Unable to delete old LCIO file.");
}
else {
log().okay("Deleted old LCIO file <" + fullFilename + ">");
@@ -140,7 +140,7 @@
m_writerIsOpen = true;
}
else {
- G4Exception("LCWriter is null!");
+ G4Exception("", "", FatalException, "LCWriter is null.");
}
}
diff -u -r1.21 -r1.22 --- LcioMcpFactory.cc 1 Sep 2011 21:13:09 -0000 1.21 +++ LcioMcpFactory.cc 31 Jan 2012 18:52:30 -0000 1.22 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.21 2011/09/01 21:13:09 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.22 2012/01/31 18:52:30 jeremy Exp $
#include "LcioMcpFactory.hh" // slic
@@ -106,7 +106,7 @@
// Need a primary particle to get mass.
else
{
- G4Exception("Could not find required LCIO primary particle.");
+ G4Exception("", "", FatalException, "Could not find required LCIO primary particle.");
}
}
// Use Geant4's mass from the particle definition, which is appropriate for SM particles.
@@ -190,7 +190,7 @@
}
else
{
- G4Exception("G4TrajectoryContainer is null!");
+ G4Exception("", "", FatalException, "G4TrajectoryContainer is null!");
}
// DEBUG
@@ -225,7 +225,7 @@
}
if (dauMcp == 0)
- G4Exception("Failed to create MCParticle.");
+ G4Exception("", "", FatalException, "Failed to create MCParticle.");
// add this to final coll
m_finalColl->addElement( dauMcp );
@@ -275,12 +275,12 @@
}
else
{
- G4Exception("Initial McpVec has no members.");
+ G4Exception("", "", FatalException, "Initial McpVec has no members.");
}
}
else
{
- G4Exception("Initial McpVec ptr is null.");
+ G4Exception("", "", FatalException, "Initial McpVec ptr is null.");
}
}
@@ -594,7 +594,7 @@
// must find it or die
if (0 == mcpDau)
{
- G4Exception("Mcp daughter was not found.");
+ G4Exception("", "", FatalException, "Mcp daughter was not found.");
}
// create dau Mcp
diff -u -r1.69 -r1.70 --- LcioMcpManager.cc 11 Feb 2011 23:32:24 -0000 1.69 +++ LcioMcpManager.cc 31 Jan 2012 18:52:30 -0000 1.70 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.69 2011/02/11 23:32:24 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.70 2012/01/31 18:52:30 jeremy Exp $
#include "LcioMcpManager.hh" // slic
@@ -143,7 +143,7 @@
m_mcpColls["initial"] = mcpColl;
}
else {
- G4Exception("FATAL ERROR: Initial collection cannot be set to null.");
+ G4Exception("", "", FatalException, "Initial collection cannot be set to null.");
}
}
@@ -155,7 +155,7 @@
LCCollection* coll = 0;
if ( findMcpCollection(collName) ) {
- G4Exception("Attempting to create duplicate Mcp collection.");
+ G4Exception("", "", FatalException, "Attempting to create duplicate Mcp collection.");
}
else {
coll = new LCCollectionVec(LCIO::MCPARTICLE);
@@ -168,7 +168,7 @@
void LcioMcpManager::registerMcpCollection(const std::string& collName, EVENT::LCCollection* mcpColl)
{
if (mcpColl->getTypeName() != LCIO::MCPARTICLE ) {
- G4Exception("ERROR: The LCCollection does not contain MCParticle objects.");
+ G4Exception("", "", FatalException, "The LCCollection does not contain MCParticle objects.");
}
if ( m_mcpColls[collName] ) {
diff -u -r1.11 -r1.12 --- LcioMcpMessenger.cc 27 Apr 2007 01:54:35 -0000 1.11 +++ LcioMcpMessenger.cc 31 Jan 2012 18:52:30 -0000 1.12 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMcpMessenger.cc,v 1.11 2007/04/27 01:54:35 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMcpMessenger.cc,v 1.12 2012/01/31 18:52:30 jeremy Exp $
#include "LcioMcpMessenger.hh" // slic
@@ -44,7 +44,7 @@
mgr->setWriteInitialMCParticleCollection( m_writeInitialCollection->GetNewBoolValue(newVals.c_str() ) );
}
else {
- G4Exception( "LcioMessenger::setNewValue() - unknown command" );
+ G4Exception("LcioMessenger::setNewValue()", "", JustWarning, "Unknown command");
}
return;
diff -u -r1.35 -r1.36 --- LcioMessenger.cc 12 Sep 2007 19:40:49 -0000 1.35 +++ LcioMessenger.cc 31 Jan 2012 18:52:30 -0000 1.36 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.35 2007/09/12 19:40:49 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.36 2012/01/31 18:52:30 jeremy Exp $
#include "LcioMessenger.hh" // slic
@@ -94,12 +94,12 @@
}
}
else {
- G4Exception( "FATAL ERROR: LcioHitsCollectionBuilder is null!" );
+ G4Exception( "", "", FatalException, "LcioHitsCollectionBuilder is null." );
}
}
// bad command; shouldn't happen
else {
- G4Exception( "LcioMessenger::setNewValue() - Unknown command." );
+ G4Exception( "LcioMessenger::setNewValue()", "", JustWarning, "Unknown command." );
}
return;
}
diff -u -r1.38 -r1.39 --- LcioPrimaryGenerator.cc 8 Apr 2011 20:49:12 -0000 1.38 +++ LcioPrimaryGenerator.cc 31 Jan 2012 18:52:30 -0000 1.39 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.38 2011/04/08 20:49:12 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioPrimaryGenerator.cc,v 1.39 2012/01/31 18:52:30 jeremy Exp $
// slic #include "LogStream.hh"
@@ -59,7 +59,7 @@
//assert( mcp );
if (mcp == 0)
- G4Exception( "Fatal Error. Could not find MCParticle at indx." );
+ G4Exception( "", "", FatalException, "Could not find MCParticle at indx." );
// debug info
G4ParticleTable* tbl = G4ParticleTable::GetParticleTable();
diff -u -r1.29 -r1.30 --- PhysicsListFactory.cc 16 Feb 2011 21:16:17 -0000 1.29 +++ PhysicsListFactory.cc 31 Jan 2012 18:52:30 -0000 1.30 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.29 2011/02/16 21:16:17 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.30 2012/01/31 18:52:30 jeremy Exp $
#include "PhysicsListFactory.hh" // Include generated list of Geant4 PhysLists.
@@ -48,7 +48,7 @@
physicslist = builder->create();
}
else {
- G4Exception("ERROR: No builder found for physics list <" + name + "> .");
+ G4Exception("", "", FatalException, "No builder found for physics list.");
}
return physicslist;
diff -u -r1.26 -r1.27 --- PhysicsListManager.cc 8 Jan 2010 23:58:12 -0000 1.26 +++ PhysicsListManager.cc 31 Jan 2012 18:52:30 -0000 1.27 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.26 2010/01/08 23:58:12 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.27 2012/01/31 18:52:30 jeremy Exp $
#include "PhysicsListManager.hh" // geant4
@@ -118,7 +118,7 @@
}
else
{
- G4Exception("ERROR: G4ProcessManager is null!");
+ G4Exception("", "", FatalException, "G4ProcessManager is null.");
}
}
}
diff -u -r1.17 -r1.18 --- RunManager.cc 8 Jan 2010 23:18:56 -0000 1.17 +++ RunManager.cc 31 Jan 2012 18:52:30 -0000 1.18 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.17 2010/01/08 23:18:56 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.18 2012/01/31 18:52:30 jeremy Exp $
#include "RunManager.hh" // lcdd
@@ -88,7 +88,7 @@
{
if ( !LCDDParser::instance()->isValidSetup() )
{
- G4Exception("FATAL ERROR: Current LCDD geometry setup is not valid.");
+ G4Exception("", "", FatalException, "Current LCDD geometry setup is not valid.");
}
G4RunManager::InitializeGeometry();
diff -u -r1.20 -r1.21 --- StdHepLoader.cc 31 May 2011 16:41:06 -0000 1.20 +++ StdHepLoader.cc 31 Jan 2012 18:52:30 -0000 1.21 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.20 2011/05/31 16:41:06 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/StdHepLoader.cc,v 1.21 2012/01/31 18:52:30 jeremy Exp $
#include "StdHepLoader.hh"
@@ -49,7 +49,7 @@
// if error, assume fatal
if ( m_reader->getError() )
{
- G4Exception( "StdHepLoader::openStdHepFile() - error opening input file." );
+ G4Exception( "StdHepLoader::openStdHepFile()", "", FatalException, "Error opening input file." );
}
// print open message
@@ -73,7 +73,7 @@
/* The error code was not EOF. Assume this means a fatal error occurred. */
if ( m_reader->getError() != LSH_ENDOFFILE ) {
log().fatal("StdHep errorcode <" + StringUtil::toString( (int)m_reader->getError() ) + ">.");
- G4Exception("FATAL ERROR: lStdHep reported an unrecoverable error.");
+ G4Exception("", "", FatalException, "lStdHep reported an unrecoverable error.");
}
/* EOF */
else {
diff -u -r1.40 -r1.41 --- StdHepToLcioConvertor.cc 23 Aug 2011 22:42:27 -0000 1.40 +++ StdHepToLcioConvertor.cc 31 Jan 2012 18:52:30 -0000 1.41 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.40 2011/08/23 22:42:27 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.41 2012/01/31 18:52:30 jeremy Exp $
#include "StdHepToLcioConvertor.hh" // slic
@@ -405,7 +405,7 @@
#ifdef SLIC_LOG
log() << LOG::fatal << "StdHepToLcioConverter::addMcpParent - Parent index is out of range <" << parIdx << ">" << LOG::done;
#endif
- G4Exception("ERROR: StdHep index (ihep) is out of range.");
+ G4Exception("", "", FatalException, "StdHep index (ihep) is out of range.");
}
MCParticleImpl* parMcp = static_cast<MCParticleImpl*>
@@ -426,7 +426,7 @@
#endif
}
else {
- G4Exception("Failed to get parent particle from MCParticle collection.");
+ G4Exception("", "", FatalException, "Failed to get parent particle from MCParticle collection.");
}
}
#ifdef SLIC_LOG
diff -u -r1.50 -r1.51 --- TrajectoryManager.cc 16 Dec 2009 00:16:05 -0000 1.50 +++ TrajectoryManager.cc 31 Jan 2012 18:52:30 -0000 1.51 @@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/TrajectoryManager.cc,v 1.50 2009/12/16 00:16:05 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/TrajectoryManager.cc,v 1.51 2012/01/31 18:52:30 jeremy Exp $
// slic #include "TrajectoryManager.hh"
@@ -257,7 +257,7 @@
log() << LOG::fatal << "FATAL ERROR: region info or track info were null in handleSecondaryTrack()." << LOG::endl
<< "region info <" << regInfo << ">" << LOG::endl
<< "track info <" << trkInfo << ">" << LOG::done;
- G4Exception("Track info or region info was null.");
+ G4Exception("", "", FatalException, "Track info or region info was null.");
}
}
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1