11 modified files
lcdd/include
diff -u -r1.6 -r1.7
--- SensitiveDetectorFactory.hh 5 Jul 2005 20:35:53 -0000 1.6
+++ SensitiveDetectorFactory.hh 30 Mar 2006 19:43:58 -0000 1.7
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorFactory.hh,v 1.6 2005/07/05 20:35:53 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/SensitiveDetectorFactory.hh,v 1.7 2006/03/30 19:43:58 jeremy Exp $
// LCDD
#include "LCDDProcessor.hh"
@@ -17,7 +17,7 @@
// GDML
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
+//#include "G4Evaluator/GDMLExpressionEvaluator.h"
#include "Saxana/SAXObject.h"
lcdd/src
diff -u -r1.6 -r1.7
--- G4SegmentationFactory.cc 9 Mar 2005 22:46:37 -0000 1.6
+++ G4SegmentationFactory.cc 30 Mar 2006 19:43:58 -0000 1.7
@@ -1,11 +1,11 @@
-// $Header: /cvs/lcd/lcdd/src/G4SegmentationFactory.cc,v 1.6 2005/03/09 22:46:37 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/G4SegmentationFactory.cc,v 1.7 2006/03/30 19:43:58 jeremy Exp $
#include "Saxana/SAXObject.h"
#include "G4SegmentationFactory.hh"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
+#include "G4Evaluator/GDMLExpressionEvaluator.h"
// LCDD segmentation elements
#include "grid_xyz.hh"
lcdd/src
diff -u -r1.14 -r1.15
--- calorimeterSubscriber.cc 27 Sep 2005 00:12:25 -0000 1.14
+++ calorimeterSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.15
@@ -1,11 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/calorimeterSubscriber.cc,v 1.14 2005/09/27 00:12:25 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/calorimeterSubscriber.cc,v 1.15 2006/03/30 19:43:58 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
// LCDD
#include "calorimeter.hh"
lcdd/src
diff -u -r1.5 -r1.6
--- global_fieldSubscriber.cc 1 Sep 2005 18:25:05 -0000 1.5
+++ global_fieldSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.6
@@ -2,7 +2,6 @@
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
#include <iostream>
lcdd/src
diff -u -r1.7 -r1.8
--- headerSubscriber.cc 22 Apr 2005 18:39:07 -0000 1.7
+++ headerSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.8
@@ -1,11 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.7 2005/04/22 18:39:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.8 2006/03/30 19:43:58 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
// LCDD
#include "LCDDProcessor.hh"
@@ -42,14 +41,14 @@
{}
virtual void Activate(const SAXObject* object)
- {
+ {
LCDDProcessor* proc = LCDDProcessor::instance();
const header* obj = dynamic_cast<const header*>( object );
LCDDHeaderRecord* hdr = new LCDDHeaderRecord();
// handle child element content
ContentSequence* seq = const_cast<ContentSequence*>( obj->get_content() );
- size_t count = seq->size();
+ size_t count = seq->size();
for( size_t i=0; i<count; i++ ) {
const ContentGroup::ContentItem& citem = seq->content( i );
@@ -57,9 +56,9 @@
SAXObject* cobj = citem.object;
if ( tag == "detector" ) {
-
+
const detector* d = dynamic_cast<detector*>( cobj );
-
+
hdr->setDetectorName( d->get_name() );
hdr->setDetectorVersion( d->get_version() );
hdr->setDetectorUrl( d->get_url() );
@@ -84,7 +83,7 @@
else if ( tag == "comment" ) {
const comment* c = dynamic_cast<comment*> ( cobj );
- hdr->setComment( c->get_comment() );
+ hdr->setComment( c->get_comment() );
}
else {
std::cerr << "Unknown content for header element." << std::endl;
@@ -93,7 +92,7 @@
// set header in LCDDProc
proc->setHeader( hdr );
-
+
// print header
hdr->printOut( std::cout );
lcdd/src
diff -u -r1.5 -r1.6
--- idspecSubscriber.cc 22 Apr 2005 18:39:07 -0000 1.5
+++ idspecSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.6
@@ -1,11 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.5 2005/04/22 18:39:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.6 2006/03/30 19:43:58 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
// LCDD
#include "LCDDProcessor.hh"
@@ -55,17 +54,17 @@
std::string name = idspec_elem->get_name();
std::string length = idspec_elem->get_length();
- IdSpec::SizeType length_s =
- (IdSpec::SizeType) StringUtil::toInt( length );
+ IdSpec::SizeType length_s =
+ (IdSpec::SizeType) StringUtil::toInt( length );
- // @todo support lengths over 64
+ // @todo support lengths over 64
if ( length_s > 64 ) {
std::cerr << "Number of bits cannot be greater than 64 at this time." << std::endl;
assert( 0 );
}
IdSpec* idspec = new IdSpec;
- idspec->setName( name );
+ idspec->setName( name );
idspec->setBitLength( length_s );
IdManager::instance()->addIdSpec( name, idspec );
@@ -88,10 +87,10 @@
// start
std::string start = idfield_elem->get_start();
- IdField::SizeType start_s =
+ IdField::SizeType start_s =
(IdField::SizeType) StringUtil::toInt( start );
- // signed
+ // signed
std::string signed_str = idfield_elem->get_signed();
bool signed_bool = StringUtil::toBool( signed_str );
@@ -99,8 +98,8 @@
std::string length = idfield_elem->get_length();
IdField::SizeType length_s =
(IdField::SizeType) StringUtil::toInt( length );
-
- // set in G4 object
+
+ // set in G4 object
idfield->setLabel( label );
idfield->setSigned( signed_bool );
idfield->setStart( start_s );
lcdd/src
diff -u -r1.1 -r1.2
--- limitsetSubscriber.cc 9 Jul 2005 00:25:57 -0000 1.1
+++ limitsetSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.2
@@ -1,11 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.1 2005/07/09 00:25:57 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.2 2006/03/30 19:43:58 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
// LCDD
#include "limit.hh"
lcdd/src
diff -u -r1.11 -r1.12
--- regionSubscriber.cc 6 Sep 2005 18:57:45 -0000 1.11
+++ regionSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.12
@@ -1,11 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/regionSubscriber.cc,v 1.11 2005/09/06 18:57:45 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionSubscriber.cc,v 1.12 2006/03/30 19:43:58 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
// LCDD
#include "region.hh"
lcdd/src
diff -u -r1.4 -r1.5
--- rz_field_mapSubscriber.cc 31 Aug 2005 18:30:01 -0000 1.4
+++ rz_field_mapSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.5
@@ -1,10 +1,9 @@
-// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.4 2005/08/31 18:30:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.5 2006/03/30 19:43:58 jeremy Exp $
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
#include "LCDDProcessor.hh"
#include "rz_field_map.hh"
lcdd/src
diff -u -r1.6 -r1.7
--- solenoidSubscriber.cc 22 Apr 2005 18:39:07 -0000 1.6
+++ solenoidSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.7
@@ -1,10 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/solenoidSubscriber.cc,v 1.6 2005/04/22 18:39:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/solenoidSubscriber.cc,v 1.7 2006/03/30 19:43:58 jeremy Exp $
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
+#include "G4Evaluator/GDMLExpressionEvaluator.h"
// processor
#include "LCDDProcessor.hh"
lcdd/src
diff -u -r1.27 -r1.28
--- volumeExtendedSubscriber.cc 6 Sep 2005 18:57:46 -0000 1.27
+++ volumeExtendedSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.28
@@ -1,11 +1,10 @@
-// $Header: /cvs/lcd/lcdd/src/volumeExtendedSubscriber.cc,v 1.27 2005/09/06 18:57:46 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/volumeExtendedSubscriber.cc,v 1.28 2006/03/30 19:43:58 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
#include "G4Processor/GDMLProcessor.h"
-#include "G4Processor/GDMLExpressionEvaluator.h"
#include "Schema/volume.h"
#include "Schema/physvol.h"
CVSspam 0.2.8
