3 removed + 2 modified, total 5 files
lcdd/include
diff -N global_field.hh
--- global_field.hh 4 Mar 2005 22:51:03 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-// $Header: /cvs/lcd/lcdd/include/Attic/global_field.hh,v 1.1 2005/03/04 22:51:03 jeremy Exp $
-
-#ifndef global_field_hh
-#define global_field_hh 1
-
-#include "Saxana/SAXObject.h"
-
-#include "GlobalFieldType.hh"
-
-/**
- @class global_field
- @brief global_field element from schema.
- */
-class global_field : public SAXObject, public GlobalFieldType
-{
-public:
- global_field()
- {}
-
- virtual ~global_field()
- {}
-
- virtual SAXObject::Type type()
- {
- return SAXObject::element;
- }
-};
-
-#endif
lcdd/schemas/lcdd/1.0
diff -u -r1.7 -r1.8
--- lcdd_fields.xsd 21 Apr 2006 23:51:27 -0000 1.7
+++ lcdd_fields.xsd 22 Apr 2006 00:04:09 -0000 1.8
@@ -13,25 +13,10 @@
</xs:documentation>
</xs:annotation>
<xs:sequence>
- <!-- <xs:element name="field" minOccurs="0" maxOccurs="unbounded" type="FieldType" /> -->
<xs:element minOccurs="0" maxOccurs="1" ref="field" />
- <!--<xs:element name="global_field" minOccurs="0" maxOccurs="1" type="GlobalFieldType" /> -->
</xs:sequence>
</xs:complexType>
- <!--
- DEPRECATED
- <xs:complexType name="GlobalFieldType">
- <xs:annotation>
- <xs:documentation>
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="fieldref" minOccurs="1" maxOccurs="1" type="ReferenceType" />
- </xs:sequence>
- </xs:complexType>
- -->
-
<xs:element name="fields" type="FieldsType">
</xs:element>
lcdd/src
diff -u -r1.21 -r1.22
--- LCDDLibLoad.cc 21 Apr 2006 23:51:27 -0000 1.21
+++ LCDDLibLoad.cc 22 Apr 2006 00:04:09 -0000 1.22
@@ -39,7 +39,6 @@
LOAD_COMPONENT(solenoidProcess);
LOAD_COMPONENT(rz_field_mapProcess);
LOAD_COMPONENT(rzbProcess);
- LOAD_COMPONENT(global_fieldProcess);
LOAD_COMPONENT(dipoleProcess);
LOAD_COMPONENT(dipole_coeffProcess);
@@ -77,8 +76,6 @@
// field
LOAD_COMPONENT(solenoidSubscriber);
LOAD_COMPONENT(rz_field_mapSubscriber);
- // DEPRECATED: global_field is no longer used
- //LOAD_COMPONENT(global_fieldSubscriber);
LOAD_COMPONENT(dipoleSubscriber);
// region
lcdd/src
diff -N global_fieldProcess.cc
--- global_fieldProcess.cc 4 Mar 2005 22:51:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,72 +0,0 @@
-// $Header: /cvs/lcd/lcdd/src/Attic/global_fieldProcess.cc,v 1.1 2005/03/04 22:51:14 jeremy Exp $
-
-#include "Saxana/ProcessingConfigurator.h"
-#include "Saxana/ProcessingContext.h"
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/StateStack.h"
-#include "Saxana/SAXProcessingState.h"
-#include "Saxana/SAXStateProcess.h"
-#include "Saxana/SAXComponentFactory.h"
-
-#include "global_field.hh"
-#include "SensitiveDetectorTypeProcess.hh"
-
-#include <iostream>
-
-/**
- @class global_fieldProcess
- @brief SAX process for global_field element.
-*/
-class global_fieldProcess : public SAXStateProcess
-{
-public:
- global_fieldProcess(const ProcessingContext* context = 0)
- : SAXStateProcess(context),
- m_obj(0)
- {}
-
- virtual ~global_fieldProcess()
- {}
-
- virtual void StartElement(const std::string&, const ASCIIAttributeList&)
- {
- //std::cout << "global_fieldProcess::StartElement: " << name << std::endl;
-
- SAXObject** obj = Context()->GetTopObject();
-
- global_field* cal = new global_field;
-
- m_obj = cal;
- *obj = cal;
- }
-
- virtual void EndElement(const std::string&)
- {
- //std::cout << "global_fieldProcess::EndElement: " << name << " " << std::endl;
- }
-
- virtual void Characters(const std::string&)
- {}
-
- virtual void StackPopNotify(const std::string& name)
- {
- //std::cout << "global_fieldProcess::StackPopNotify: " << name << std::endl;
-
- SAXObject** so = Context()->GetTopObject();
- global_field* fobj = dynamic_cast<global_field*>( m_obj );
-
- fobj->add_content( name, *so);
- }
-
- virtual const std::string& State() const
- {
- static std::string tag = "global_field";
- return tag;
- }
-
-protected:
- SAXObject* m_obj;
-
-};
-
-DECLARE_PROCESS_FACTORY(global_fieldProcess)
lcdd/src
diff -N global_fieldSubscriber.cc
--- global_fieldSubscriber.cc 21 Apr 2006 23:51:27 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,81 +0,0 @@
-#include "Saxana/SAXSubscriber.h"
-#include "Saxana/SAXComponentFactory.h"
-
-#include "G4Processor/GDMLProcessor.h"
-
-#include <iostream>
-
-#include "LCDDProcessor.hh"
-#include "global_field.hh"
-#include "FieldType.hh"
-
-// Geant4
-#include "G4MagneticField.hh"
-
-/**
- * @class global_fieldSubscriber
- * @brief SAX subscriber for global_field element.
- * @note Resolves fieldref and sets global field in LCDDProcessor.
- */
-class global_fieldSubscriber : virtual public SAXSubscriber
-{
-public:
- virtual const SAXComponentObject* Build() const
- {
- return this;
- }
-
-public:
- global_fieldSubscriber()
- {
- Subscribe( "global_field" );
- }
-
- virtual ~global_fieldSubscriber()
- {}
-
- virtual void Activate( const SAXObject* object)
- {
- //std::cout << "global_field Subscriber" << std::endl;
-
- const global_field* fobj = 0;
- G4MagneticField* mag = 0;
- LCDDProcessor* proc = LCDDProcessor::instance();
-
- if ( object != 0 ) {
- fobj = dynamic_cast<const global_field*>( object );
-
- if ( fobj ) {
- const ContentSequence* seq = fobj->get_content();
-
- size_t count = seq->size();
-
- for ( size_t i = 0; i < count; i++ ) {
- if ( seq->content(i).tag == "fieldref" ) {
- FieldType::fieldref* fref =
- dynamic_cast<FieldType::fieldref*>( seq->content(i).object );
-
- //std::cout << "fieldref: " << fref->get_ref() << std::endl;
-
- mag = proc->getMagneticField( fref->get_ref() );
-
- if ( mag ) {
- proc->setGlobalMagneticField( mag );
- }
- /* FATAL ERROR: field was not found */
- else {
- std::cerr << "Unknown field reference: " << fref->get_ref() << std::endl;
- G4Exception("Failed to setup specified global field.");
- }
- }
- }
- }
- else {
- std::cerr << "Failed cast to global_field!" << std::endl;
- }
- }
- }
-};
-
-DECLARE_SUBSCRIBER_FACTORY(global_fieldSubscriber)
-
CVSspam 0.2.8
