Commit in gdml2/CPPGDML/G4Binding/G4Subscribers on MAIN | |||
G4Subscribers/BooleanSolidTypeSubscriber.h | +3 | -3 | 1.1.1.1 -> 1.2 |
src/assemblySubscriber.cpp | +4 | -4 | 1.1.1.1 -> 1.2 |
/materialSubscriber.cpp | +4 | -3 | 1.1.1.1 -> 1.2 |
/reflectedsolidSubscriber.cpp | +1 | -1 | 1.1.1.1 -> 1.2 |
/setupSubscriber.cpp | +1 | -1 | 1.1.1.1 -> 1.2 |
/volumeSubscriber.cpp | +12 | -12 | 1.1.1.1 -> 1.2 |
+25 | -24 |
updates for G4 9.5
diff -u -r1.1.1.1 -r1.2 --- BooleanSolidTypeSubscriber.h 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ BooleanSolidTypeSubscriber.h 1 Feb 2012 12:10:23 -0000 1.2 @@ -1,5 +1,5 @@
// -*- C++ -*-
-// $Id: BooleanSolidTypeSubscriber.h,v 1.1.1.1 2010/07/13 15:18:49 jeremy Exp $
+// $Id: BooleanSolidTypeSubscriber.h,v 1.2 2012/02/01 12:10:23 jeremy Exp $
// GEANT4 tag $Name: $ #ifndef GDML_G4_BOOLEANSOLIDTYPESUBSCRIBER_H #define GDML_G4_BOOLEANSOLIDTYPESUBSCRIBER_H 1
@@ -71,7 +71,7 @@
std::cerr << "Boolean solid " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your solids or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if( bseq->content(idx).tag == "second" ) { BooleanSolidType::second* s2 = dynamic_cast<BooleanSolidType::second*>
@@ -85,7 +85,7 @@
std::cerr << "Boolean solid " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your solids or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if( bseq->content(idx).tag == "choice" ) { // We apparently got either position or rotation or both
diff -u -r1.1.1.1 -r1.2 --- assemblySubscriber.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ assemblySubscriber.cpp 1 Feb 2012 12:10:23 -0000 1.2 @@ -1,5 +1,5 @@
//
-// $Id: assemblySubscriber.cpp,v 1.1.1.1 2010/07/13 15:18:49 jeremy Exp $
+// $Id: assemblySubscriber.cpp,v 1.2 2012/02/01 12:10:23 jeremy Exp $
#include "Saxana/SAXSubscriber.h" #include "Saxana/SAXComponentFactory.h"
@@ -89,7 +89,7 @@
std::cerr << "Assembly volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your volumes or add the missing one..." << std::endl; std::cerr << "\nNOTE! Assembly can't contain another assembly!\n" << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if( physvol_seq->content(cidx).tag == "choice" )
@@ -146,7 +146,7 @@
<< " can't be created!" << std::endl; std::cerr << "Please, check your position definitions or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if( avchoice->content().tag == "rotationref" ) {
@@ -160,7 +160,7 @@
<< " can't be created!" << std::endl; std::cerr << "Please, check your rotation definitions or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else { /* Should not happen */ } // end of ifs-over pos. and rot. } else { /* Should not happen */ } // end of if-choice
diff -u -r1.1.1.1 -r1.2 --- materialSubscriber.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ materialSubscriber.cpp 1 Feb 2012 12:10:23 -0000 1.2 @@ -182,7 +182,7 @@
std::cerr << "Material " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your materials or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } }
@@ -218,7 +218,7 @@
std::cerr << "Material " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your materials or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } }
@@ -242,7 +242,8 @@
int numbofentries = matrix.size()/matrix.get_coldim(); for(int p=1;p<numbofentries+1;p++)
- propvect->AddElement(matrix.get_value(p,1), matrix.get_value(p,2));
+ //propvect->AddElement(matrix.get_value(p,1), matrix.get_value(p,2));
+ propvect->InsertValues(matrix.get_value(p,1), matrix.get_value(p,2));
matprop->AddProperty((obj->get_properties()[i]->get_name()).c_str(), propvect); }
diff -u -r1.1.1.1 -r1.2 --- reflectedsolidSubscriber.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ reflectedsolidSubscriber.cpp 1 Feb 2012 12:10:23 -0000 1.2 @@ -53,7 +53,7 @@
std::cerr << "Reflected solid " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your solids or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} std::string sval = obj->get_sx();
diff -u -r1.1.1.1 -r1.2 --- setupSubscriber.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ setupSubscriber.cpp 1 Feb 2012 12:10:23 -0000 1.2 @@ -54,7 +54,7 @@
std::cerr << "World volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your volumes or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} G4VPhysicalVolume* wpv = new G4PVPlacement( 0, G4ThreeVector(), wlv, wlv->GetName(),
diff -u -r1.1.1.1 -r1.2 --- volumeSubscriber.cpp 13 Jul 2010 15:18:49 -0000 1.1.1.1 +++ volumeSubscriber.cpp 1 Feb 2012 12:10:23 -0000 1.2 @@ -87,7 +87,7 @@
std::cerr << "VOLUME SUBSCRIBER:: material " << mref->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your materials or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if(seq->content(i).tag == "solidref") { // Check & retrieve solid
@@ -101,7 +101,7 @@
std::cerr << "VOLUME SUBSCRIBER:: solid " << sref->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your solids or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} // At this point we should have material & solid so we can create log. volume
@@ -166,7 +166,7 @@
std::cerr << "VOLUME SUBSCRIBER:: physvol volume " << vol_refName << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your volumes or add the missing one..." << std::endl;
- G4Exception("Shutting-down due to error(s) in GDML input...");
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} doAssemblyInprint = true; }
@@ -207,7 +207,7 @@
processor->AddParsedFile(f->get_name(),tempWorld); if (tempWorld == 0)
- G4Exception("TEMPORARY World volume not set properly! Check your setup selection criteria or GDML input!");
+ G4Exception("", "", FatalException, "TEMPORARY World volume not set properly! Check your setup selection criteria or GDML input!");
plog = tempWorld->GetLogicalVolume(); }
@@ -216,7 +216,7 @@
const G4VPhysicalVolume* tempWorld = processor->GetWorldVolumeOfParsedFile(f->get_name()); if(tempWorld == 0)
- G4Exception("TEMPORARY World volume not set properly! Check your setup selection criteria or GDML input!");
+ G4Exception("", "", FatalException, "TEMPORARY World volume not set properly! Check your setup selection criteria or GDML input!");
efwvn = tempWorld->GetName(); plog = const_cast<G4LogicalVolume*>(tempWorld->GetLogicalVolume());
@@ -225,7 +225,7 @@
if(plog == 0) { std::cerr << "plog == 0 !!" << std::endl;
- G4Exception("Shutting-down due to error(s) in GDML input...");
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if (physvol_volchoice->content(cidx).tag == "choice") {
@@ -287,7 +287,7 @@
std::cerr << "VOLUME SUBSCRIBER:: physvol's position " << pr->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, check your position definitions or add the missing one..." << std::endl;
- G4Exception("Shutting-down due to error(s) in GDML input...");
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if (vchoice->content().tag == "rotationref") {
@@ -300,7 +300,7 @@
std::cerr << "VOLUME SUBSCRIBER:: physvol's rotation " << rr->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, check your rotation definitions or add the missing one..." << std::endl;
- G4Exception("Shutting-down due to error(s) in GDML input...");
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } else if (vchoice->content().tag == "scaleref") {
@@ -313,7 +313,7 @@
std::cerr << "VOLUME SUBSCRIBER:: physvol's scale " << sr->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, check your rotation definitions or add the missing one..." << std::endl;
- G4Exception("Shutting-down due to error(s) in GDML input...");
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} } } // end of if-choice
@@ -440,7 +440,7 @@
std::cerr << "VOLUME SUBSCRIBER:: physvol volume " << vr->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your volumes or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} doAssemblyInprint = true; }
@@ -521,7 +521,7 @@
std::cerr << "VOLUME SUBSCRIBER:: physvol volume " << vr->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your volumes or add the missing one..." << std::endl;
- G4Exception("Shutting-down due to error(s) in GDML input...");
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input...");
} doAssemblyInprint = true;
@@ -591,7 +591,7 @@
std::cerr << "VOLUME SUBSCRIBER:: physvol volume " << vr->get_ref() << " not found!" << std::endl; std::cerr << "Volume " << obj->get_name() << " can't be created!" << std::endl; std::cerr << "Please, re-order your volumes or add the missing one..." << std::endl;
- G4Exception( "Shutting-down due to error(s) in GDML input..." );
+ G4Exception("", "", FatalException, "Shutting-down due to error(s) in GDML input..." );
} doAssemblyInprint = true; }
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