Changeset 1293 for trunk/source/tracking

Timestamp:

Jun 2, 2010, 10:23:13 AM (15 years ago)

Author:

garnier

Message:

CVS update

Location:

trunk/source/tracking

Files:

• History (modified) (2 diffs)
• include/G4SmoothTrajectory.hh (modified) (2 diffs)
• include/G4Trajectory.hh (modified) (2 diffs)
• include/G4VTrajectory.hh (modified) (2 diffs)
• src/G4RichTrajectory.cc (modified) (4 diffs)
• src/G4RichTrajectoryPoint.cc (modified) (2 diffs)
• src/G4SmoothTrajectory.cc (modified) (2 diffs)
• src/G4Trajectory.cc (modified) (2 diffs)
• src/G4VTrajectory.cc (modified) (2 diffs)

trunk/source/tracking/History

@@ -1 @@
-$Id: History,v 1.137 2009/11/24 10:04:14 perl Exp $
-$Name: geant4-09-03 $ 
+$Id: History,v 1.141 2010/05/29 21:31:28 allison Exp $
+$Name: tracking-V09-03-03 $ 
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+29 May 2010 John Allison (tracking-V09-03-03)
+- G4VTrajectory:
+  o Added virtual void DrawTrajectory() in preparation for i_mode migration.
+- G4Trajectory and G4SmoothTrajectory: followed the above.
+  o (G4RichTrajectory inherits G4Trajectory so no need to change.)
+
+28 May 2010 John Allison (tracking-V09-03-02)
+- G4VTrajectory.cc: Added explicit once-only i_mode deprecation warning.
+
+13 May 2010 John Allison (tracking-V09-03-01 - needs greps-V09-03-00)
+- G4VTrajectory.cc: Added a statement to set IsDefaultDrawTrajectory,
+  to assist deprecation of i-mode trajectory drawing parameter.  After
+  10.0, it can be removed.
+
+22 Feb 2010 John Allison (tracking-V09-03-00)
+- G4RichTrajectory: Fixed bug in MergeTrajectory (should not invoke
+  G4Trajectory::MergeTrajectory).
+- G4RichTrajectory and G4RichTrajectoryPoint:
+  o Eliminated spaces in G4AttValue values.
+  o G4AttValue values are "None" for attributes derived from zero pointers.
 
 24 Nov 2009 Joseph Perl (tracking-V09-02-07)

trunk/source/tracking/include/G4SmoothTrajectory.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4SmoothTrajectory.hh,v 1.12 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4SmoothTrajectory.hh,v 1.13 2010/05/29 21:31:03 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 //---------------------------------------------------------------
@@ -102 +102 @@
 // Other member functions
    virtual void ShowTrajectory(std::ostream& os=G4cout) const;
-   virtual void DrawTrajectory(G4int i_mode=0) const;
+   virtual void DrawTrajectory() const;
+   virtual void DrawTrajectory(G4int i_mode) const;
    virtual void AppendStep(const G4Step* aStep);
    virtual int GetPointEntries() const { return positionRecord->size(); }

trunk/source/tracking/include/G4Trajectory.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Trajectory.hh,v 1.25 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4Trajectory.hh,v 1.26 2010/05/29 21:31:03 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 //---------------------------------------------------------------
@@ -108 +108 @@
 // Other member functions
    virtual void ShowTrajectory(std::ostream& os=G4cout) const;
-   virtual void DrawTrajectory(G4int i_mode=0) const;
+   virtual void DrawTrajectory() const;
+   virtual void DrawTrajectory(G4int i_mode) const;
    virtual void AppendStep(const G4Step* aStep);
    virtual int GetPointEntries() const { return positionRecord->size(); }

trunk/source/tracking/include/G4VTrajectory.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VTrajectory.hh,v 1.17 2006/06/29 21:15:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4VTrajectory.hh,v 1.18 2010/05/29 21:31:03 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 //---------------------------------------------------------------
@@ -90 +90 @@
    // the user needs to follow with new-line or end-of-string,
    // depending on the nature of os.
-   virtual void DrawTrajectory(G4int i_mode=0) const;
+   virtual void DrawTrajectory() const;
+   virtual void DrawTrajectory(G4int i_mode) const;
    // Draw the trajectory.  A default implementation in this base
    // class may be used or may be overridden in the concrete class.

trunk/source/tracking/src/G4RichTrajectory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RichTrajectory.cc,v 1.8 2009/11/24 10:04:14 perl Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4RichTrajectory.cc,v 1.9 2010/02/22 21:26:56 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 // ---------------------------------------------------------------
@@ -145 +145 @@
   if(!secondTrajectory) return;
 
-  G4Trajectory::MergeTrajectory(secondTrajectory);
-
   G4RichTrajectory* seco = (G4RichTrajectory*)secondTrajectory;
   G4int ent = seco->GetPointEntries();
@@ -245 +243 @@
     values->push_back(G4AttValue("CPTN",G4VProcess::GetProcessTypeName(type),""));
   } else {
-    values->push_back(G4AttValue("CPN","User Defined",""));
-    values->push_back(G4AttValue("CPTN","User",""));
+    values->push_back(G4AttValue("CPN","None",""));
+    values->push_back(G4AttValue("CPTN","None",""));
   }
 
@@ -266 +264 @@
     values->push_back(G4AttValue("EPTN",G4VProcess::GetProcessTypeName(type),""));
   } else {
-    values->push_back(G4AttValue("EPN","User Defined",""));
-    values->push_back(G4AttValue("EPTN","User",""));
+    values->push_back(G4AttValue("EPN","None",""));
+    values->push_back(G4AttValue("EPTN","None",""));
   }
 

trunk/source/tracking/src/G4RichTrajectoryPoint.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RichTrajectoryPoint.cc,v 1.5 2009/11/24 10:04:14 perl Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4RichTrajectoryPoint.cc,v 1.6 2010/02/22 21:26:56 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 //
@@ -236 +236 @@
         ""));
   } else {
-    values->push_back
-      (G4AttValue("PDS","User Defined Limit in Current Volume",""));
-    values->push_back(G4AttValue("PTDS","User",""));
+    values->push_back(G4AttValue("PDS","None",""));
+    values->push_back(G4AttValue("PTDS","None",""));
   }
 

trunk/source/tracking/src/G4SmoothTrajectory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4SmoothTrajectory.cc,v 1.19 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4SmoothTrajectory.cc,v 1.20 2010/05/29 21:31:03 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 //
@@ -120 +120 @@
 }
 
+void G4SmoothTrajectory::DrawTrajectory() const
+{
+  // Invoke the default implementation in G4VTrajectory...
+  G4VTrajectory::DrawTrajectory();
+  // ... or override with your own code here.
+}
+
 void G4SmoothTrajectory::DrawTrajectory(G4int i_mode) const
 {

trunk/source/tracking/src/G4Trajectory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Trajectory.cc,v 1.33 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4Trajectory.cc,v 1.34 2010/05/29 21:31:03 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 // ---------------------------------------------------------------
@@ -115 +115 @@
 }
 
+void G4Trajectory::DrawTrajectory() const
+{
+  // Invoke the default implementation in G4VTrajectory...
+  G4VTrajectory::DrawTrajectory();
+  // ... or override with your own code here.
+}
+
 void G4Trajectory::DrawTrajectory(G4int i_mode) const
 {

trunk/source/tracking/src/G4VTrajectory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4VTrajectory.cc,v 1.15 2010/05/29 21:31:03 allison Exp $
+// GEANT4 tag $Name: tracking-V09-03-03 $
 //
 // ---------------------------------------------------------------
@@ -116 +116 @@
 }
 
+void G4VTrajectory::DrawTrajectory() const
+{
+  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
+
+  if (0 != pVVisManager) {
+    pVVisManager->DispatchToModel(*this);
+  }
+}
+
 void G4VTrajectory::DrawTrajectory(G4int i_mode) const
 {
   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
+
+  static G4bool warnedAboutIMode = false;
+  if (!warnedAboutIMode) {
+    G4Exception
+        ("G4VTrajectory::DrawTrajectory",
+         "",
+         JustWarning,
+"WARNING: DEPRECATED: The use of i_mode argument in DrawTrajectory"
+"\n  is deprecated and will be removed at the next major release.");
+    warnedAboutIMode = true;
+  }
 
   if (0 != pVVisManager) {