23 modified files
lcdd/src
diff -u -r1.3 -r1.4
--- LCDDFieldManager.cc 9 May 2006 01:56:35 -0000 1.3
+++ LCDDFieldManager.cc 5 Jun 2006 17:41:29 -0000 1.4
@@ -44,6 +44,7 @@
for (LCDDProcessor::MagneticFields::const_iterator iter = proc->getMagneticFieldsBegin();
iter != proc->getMagneticFieldsEnd();
iter++) {
+ std::cout << "add field" << std::endl;
fields.push_back(iter->second);
}
@@ -72,6 +73,7 @@
void LCDDFieldManager::initialize(G4MagneticField* field)
{
+ std::cout << "init field" << std::endl;
if (field != 0) {
G4FieldManager* fieldMgr =
G4TransportationManager::GetTransportationManager()->GetFieldManager();
lcdd/src
diff -u -r1.3 -r1.4
--- MagneticFieldOverlay.cc 4 May 2006 22:22:18 -0000 1.3
+++ MagneticFieldOverlay.cc 5 Jun 2006 17:41:29 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/MagneticFieldOverlay.cc,v 1.3 2006/05/04 22:22:18 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/MagneticFieldOverlay.cc,v 1.4 2006/06/05 17:41:29 jeremy Exp $
#include "MagneticFieldOverlay.hh"
#include <iostream>
@@ -31,5 +31,5 @@
}
//std::cout << "x y z: " << Point[0] << " " << Point[1] << " " << Point[2] << std::endl;
- //std::cout << "bx, by, bz: " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl;
+ //std::cout << "bx, by, bz: " << Bfield[0] << " " << Bfield[1] << " " << Bfield[2] << std::endl << std::endl;
}
lcdd/src
diff -u -r1.5 -r1.6
--- authorProcess.cc 26 Apr 2005 18:33:16 -0000 1.5
+++ authorProcess.cc 5 Jun 2006 17:41:29 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/authorProcess.cc,v 1.5 2005/04/26 18:33:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/authorProcess.cc,v 1.6 2006/06/05 17:41:29 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
@@ -65,4 +65,4 @@
SAXObject* m_obj;
};
-DECLARE_PROCESS_FACTORY(authorProcess);
+DECLARE_PROCESS_FACTORY(authorProcess)
lcdd/src
diff -u -r1.4 -r1.5
--- commentProcess.cc 6 May 2005 01:51:17 -0000 1.4
+++ commentProcess.cc 5 Jun 2006 17:41:29 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/commentProcess.cc,v 1.4 2005/05/06 01:51:17 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/commentProcess.cc,v 1.5 2006/06/05 17:41:29 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
@@ -66,4 +66,4 @@
SAXObject* m_obj;
};
-DECLARE_PROCESS_FACTORY(commentProcess);
+DECLARE_PROCESS_FACTORY(commentProcess)
lcdd/src
diff -u -r1.4 -r1.5
--- detectorProcess.cc 4 Mar 2005 22:51:13 -0000 1.4
+++ detectorProcess.cc 5 Jun 2006 17:41:29 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/detectorProcess.cc,v 1.4 2005/03/04 22:51:13 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/detectorProcess.cc,v 1.5 2006/06/05 17:41:29 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
@@ -39,7 +39,7 @@
SAXObject** obj = Context()->GetTopObject();
detector* d = new detector;
-
+
d->set_name( attrs.getValue( "name" ) );
d->set_version( attrs.getValue( "version" ) );
d->set_url( attrs.getValue( "url" ) );
@@ -67,4 +67,4 @@
SAXObject* m_obj;
};
-DECLARE_PROCESS_FACTORY(detectorProcess);
+DECLARE_PROCESS_FACTORY(detectorProcess)
lcdd/src
diff -u -r1.2 -r1.3
--- dipoleProcess.cc 5 May 2006 23:29:16 -0000 1.2
+++ dipoleProcess.cc 5 Jun 2006 17:41:30 -0000 1.3
@@ -1,6 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/dipoleProcess.cc,v 1.2 2006/05/05 23:29:16 jeremy Exp $
-#ifndef dipoleProcess_hh
-#define dipoleProcess_hh 1
+// $Header: /cvs/lcd/lcdd/src/dipoleProcess.cc,v 1.3 2006/06/05 17:41:30 jeremy Exp $
// gdml
#include "Saxana/ProcessingConfigurator.h"
@@ -73,6 +71,4 @@
SAXObject* m_obj;
};
-DECLARE_PROCESS_FACTORY(dipoleProcess);
-
-#endif
+DECLARE_PROCESS_FACTORY(dipoleProcess)
lcdd/src
diff -u -r1.2 -r1.3
--- dipoleSubscriber.cc 5 May 2006 23:29:16 -0000 1.2
+++ dipoleSubscriber.cc 5 Jun 2006 17:41:30 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/dipoleSubscriber.cc,v 1.2 2006/05/05 23:29:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/dipoleSubscriber.cc,v 1.3 2006/06/05 17:41:30 jeremy Exp $
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
@@ -100,4 +100,4 @@
};
};
-DECLARE_SUBSCRIBER_FACTORY(dipoleSubscriber);
+DECLARE_SUBSCRIBER_FACTORY(dipoleSubscriber)
lcdd/src
diff -u -r1.4 -r1.5
--- fieldrefProcess.cc 20 Apr 2005 19:04:41 -0000 1.4
+++ fieldrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/fieldrefProcess.cc,v 1.4 2005/04/20 19:04:41 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/fieldrefProcess.cc,v 1.5 2006/06/05 17:41:30 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h"
@@ -12,17 +12,17 @@
{
public:
fieldrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
+ : ReferenceTypeProcess(context)
{}
- virtual ~fieldrefProcess()
+ virtual ~fieldrefProcess()
{}
virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
{
SAXObject** obj = Context()->GetTopObject();
- FieldType::fieldref* fref =
+ FieldType::fieldref* fref =
new FieldType::fieldref;
*obj = fref;
@@ -36,11 +36,11 @@
ReferenceTypeProcess::EndElement(name);
}
- virtual const std::string& State() const
+ virtual const std::string& State() const
{
static std::string tag = "fieldref";
return tag;
}
};
-DECLARE_PROCESS_FACTORY(fieldrefProcess);
+DECLARE_PROCESS_FACTORY(fieldrefProcess)
lcdd/src
diff -u -r1.5 -r1.6
--- generatorProcess.cc 26 Apr 2005 18:33:16 -0000 1.5
+++ generatorProcess.cc 5 Jun 2006 17:41:30 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/generatorProcess.cc,v 1.5 2005/04/26 18:33:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/generatorProcess.cc,v 1.6 2006/06/05 17:41:30 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
@@ -68,4 +68,4 @@
SAXObject* m_obj;
};
-DECLARE_PROCESS_FACTORY(generatorProcess);
+DECLARE_PROCESS_FACTORY(generatorProcess)
lcdd/src
diff -u -r1.4 -r1.5
--- headerProcess.cc 26 Apr 2005 18:33:16 -0000 1.4
+++ headerProcess.cc 5 Jun 2006 17:41:30 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/headerProcess.cc,v 1.4 2005/04/26 18:33:16 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/headerProcess.cc,v 1.5 2006/06/05 17:41:30 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
@@ -39,7 +39,7 @@
SAXObject** obj = Context()->GetTopObject();
header* h = new header;
-
+
m_obj = h;
*obj = h;
}
@@ -71,4 +71,4 @@
SAXObject* m_obj;
};
-DECLARE_PROCESS_FACTORY(headerProcess);
+DECLARE_PROCESS_FACTORY(headerProcess)
lcdd/src
diff -u -r1.8 -r1.9
--- headerSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.8
+++ headerSubscriber.cc 5 Jun 2006 17:41:30 -0000 1.9
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.8 2006/03/30 19:43:58 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/headerSubscriber.cc,v 1.9 2006/06/05 17:41:30 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
@@ -101,4 +101,4 @@
};
-DECLARE_SUBSCRIBER_FACTORY(headerSubscriber);
+DECLARE_SUBSCRIBER_FACTORY(headerSubscriber)
lcdd/src
diff -u -r1.6 -r1.7
--- idspecSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.6
+++ idspecSubscriber.cc 5 Jun 2006 17:41:30 -0000 1.7
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.6 2006/03/30 19:43:58 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecSubscriber.cc,v 1.7 2006/06/05 17:41:30 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
@@ -129,4 +129,4 @@
}
};
-DECLARE_SUBSCRIBER_FACTORY(idspecSubscriber);
+DECLARE_SUBSCRIBER_FACTORY(idspecSubscriber)
lcdd/src
diff -u -r1.2 -r1.3
--- idspecrefProcess.cc 4 Mar 2005 22:51:14 -0000 1.2
+++ idspecrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/idspecrefProcess.cc,v 1.2 2005/03/04 22:51:14 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/idspecrefProcess.cc,v 1.3 2006/06/05 17:41:30 jeremy Exp $
// LCDD
#include "IdSpecType.hh"
@@ -26,7 +26,7 @@
virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
{
- SAXObject** obj = Context()->GetTopObject();
+ SAXObject** obj = Context()->GetTopObject();
IdSpecType::idspecref* s =
new IdSpecType::idspecref;
@@ -48,4 +48,4 @@
}
};
-DECLARE_PROCESS_FACTORY(idspecrefProcess);
+DECLARE_PROCESS_FACTORY(idspecrefProcess)
lcdd/src
diff -u -r1.3 -r1.4
--- limitProcess.cc 9 Jul 2005 00:25:57 -0000 1.3
+++ limitProcess.cc 5 Jun 2006 17:41:30 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/limitProcess.cc,v 1.3 2005/07/09 00:25:57 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitProcess.cc,v 1.4 2006/06/05 17:41:30 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -66,4 +66,4 @@
};
-DECLARE_PROCESS_FACTORY(limitProcess);
+DECLARE_PROCESS_FACTORY(limitProcess)
lcdd/src
diff -u -r1.1 -r1.2
--- limitsetProcess.cc 9 Jul 2005 00:25:57 -0000 1.1
+++ limitsetProcess.cc 5 Jun 2006 17:41:30 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetProcess.cc,v 1.1 2005/07/09 00:25:57 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetProcess.cc,v 1.2 2006/06/05 17:41:30 jeremy Exp $
#include "limitset.hh"
#include "limit.hh"
@@ -77,4 +77,4 @@
};
-DECLARE_PROCESS_FACTORY(limitsetProcess);
+DECLARE_PROCESS_FACTORY(limitsetProcess)
lcdd/src
diff -u -r1.2 -r1.3
--- limitsetSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.2
+++ limitsetSubscriber.cc 5 Jun 2006 17:41:30 -0000 1.3
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.2 2006/03/30 19:43:58 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetSubscriber.cc,v 1.3 2006/06/05 17:41:30 jeremy Exp $
// GDML
#include "Saxana/SAXSubscriber.h"
@@ -102,4 +102,4 @@
}
};
-DECLARE_SUBSCRIBER_FACTORY(limitsetSubscriber);
+DECLARE_SUBSCRIBER_FACTORY(limitsetSubscriber)
lcdd/src
diff -u -r1.1 -r1.2
--- limitsetrefProcess.cc 9 Jul 2005 00:25:58 -0000 1.1
+++ limitsetrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/limitsetrefProcess.cc,v 1.1 2005/07/09 00:25:58 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/limitsetrefProcess.cc,v 1.2 2006/06/05 17:41:30 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h"
@@ -44,4 +44,4 @@
}
};
-DECLARE_PROCESS_FACTORY(limitsetrefProcess);
+DECLARE_PROCESS_FACTORY(limitsetrefProcess)
lcdd/src
diff -u -r1.3 -r1.4
--- regionrefProcess.cc 20 Apr 2005 19:04:41 -0000 1.3
+++ regionrefProcess.cc 5 Jun 2006 17:41:30 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/regionrefProcess.cc,v 1.3 2005/04/20 19:04:41 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/regionrefProcess.cc,v 1.4 2006/06/05 17:41:30 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h"
@@ -13,17 +13,17 @@
{
public:
regionrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
+ : ReferenceTypeProcess(context)
{}
- virtual ~regionrefProcess()
+ virtual ~regionrefProcess()
{}
virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
{
SAXObject** obj = Context()->GetTopObject();
- RegionType::regionref* regref =
+ RegionType::regionref* regref =
new RegionType::regionref;
*obj = regref;
@@ -37,11 +37,11 @@
ReferenceTypeProcess::EndElement(name);
}
- virtual const std::string& State() const
+ virtual const std::string& State() const
{
static std::string tag = "regionref";
return tag;
}
};
-DECLARE_PROCESS_FACTORY(regionrefProcess);
+DECLARE_PROCESS_FACTORY(regionrefProcess)
lcdd/src
diff -u -r1.3 -r1.4
--- rz_field_mapProcess.cc 31 Aug 2005 18:30:01 -0000 1.3
+++ rz_field_mapProcess.cc 5 Jun 2006 17:41:30 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/rz_field_mapProcess.cc,v 1.3 2005/08/31 18:30:01 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rz_field_mapProcess.cc,v 1.4 2006/06/05 17:41:30 jeremy Exp $
#include "FieldMapTypeProcess.hh"
#include "rz_field_map.hh"
#include <iostream>
@@ -65,4 +65,4 @@
}
};
-DECLARE_PROCESS_FACTORY(rz_field_mapProcess);
+DECLARE_PROCESS_FACTORY(rz_field_mapProcess)
lcdd/src
diff -u -r1.5 -r1.6
--- rz_field_mapSubscriber.cc 30 Mar 2006 19:43:58 -0000 1.5
+++ rz_field_mapSubscriber.cc 5 Jun 2006 17:41:31 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.5 2006/03/30 19:43:58 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rz_field_mapSubscriber.cc,v 1.6 2006/06/05 17:41:31 jeremy Exp $
#include "Saxana/SAXSubscriber.h"
#include "Saxana/SAXComponentFactory.h"
@@ -122,4 +122,4 @@
}
};
-DECLARE_SUBSCRIBER_FACTORY(rz_field_mapSubscriber);
+DECLARE_SUBSCRIBER_FACTORY(rz_field_mapSubscriber)
lcdd/src
diff -u -r1.1 -r1.2
--- rzbProcess.cc 29 Aug 2005 23:23:20 -0000 1.1
+++ rzbProcess.cc 5 Jun 2006 17:41:31 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/rzbProcess.cc,v 1.1 2005/08/29 23:23:20 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/rzbProcess.cc,v 1.2 2006/06/05 17:41:31 jeremy Exp $
#include "Saxana/ProcessingConfigurator.h"
#include "Saxana/ProcessingContext.h"
#include "Saxana/SAXProcessor.h"
@@ -71,4 +71,4 @@
};
-DECLARE_PROCESS_FACTORY(rzbProcess);
+DECLARE_PROCESS_FACTORY(rzbProcess)
lcdd/src
diff -u -r1.4 -r1.5
--- sdrefProcess.cc 20 Apr 2005 19:03:50 -0000 1.4
+++ sdrefProcess.cc 5 Jun 2006 17:41:31 -0000 1.5
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/sdrefProcess.cc,v 1.4 2005/04/20 19:03:50 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/sdrefProcess.cc,v 1.5 2006/06/05 17:41:31 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h"
#include "SensitiveDetectorType.hh"
@@ -14,17 +14,17 @@
{
public:
sdrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
+ : ReferenceTypeProcess(context)
{}
- virtual ~sdrefProcess()
+ virtual ~sdrefProcess()
{}
virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
{
SAXObject** obj = Context()->GetTopObject();
- SensitiveDetectorType::sdref* s =
+ SensitiveDetectorType::sdref* s =
new SensitiveDetectorType::sdref;
*obj = s;
@@ -38,11 +38,11 @@
ReferenceTypeProcess::EndElement(name);
}
- virtual const std::string& State() const
+ virtual const std::string& State() const
{
static std::string tag = "sdref";
return tag;
}
};
-DECLARE_PROCESS_FACTORY(sdrefProcess);
+DECLARE_PROCESS_FACTORY(sdrefProcess)
lcdd/src
diff -u -r1.1 -r1.2
--- visrefProcess.cc 25 Mar 2005 01:20:07 -0000 1.1
+++ visrefProcess.cc 5 Jun 2006 17:41:31 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/visrefProcess.cc,v 1.1 2005/03/25 01:20:07 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/visrefProcess.cc,v 1.2 2006/06/05 17:41:31 jeremy Exp $
#include "Processes/ReferenceTypeProcess.h"
@@ -13,17 +13,17 @@
{
public:
visrefProcess(const ProcessingContext* context = 0)
- : ReferenceTypeProcess(context)
+ : ReferenceTypeProcess(context)
{}
- virtual ~visrefProcess()
+ virtual ~visrefProcess()
{}
virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs)
{
SAXObject** obj = Context()->GetTopObject();
- VisType::visref* visref =
+ VisType::visref* visref =
new VisType::visref;
*obj = visref;
@@ -37,11 +37,11 @@
ReferenceTypeProcess::EndElement(name);
}
- virtual const std::string& State() const
+ virtual const std::string& State() const
{
static std::string tag = "visref";
return tag;
}
};
-DECLARE_PROCESS_FACTORY(visrefProcess);
+DECLARE_PROCESS_FACTORY(visrefProcess)
CVSspam 0.2.8