Changeset 1244 for trunk/source

Timestamp:

Apr 27, 2010, 5:43:40 PM (14 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/visualization/modeling

Files:

• GNUmakefile (modified) (1 diff)
• src/G4TrajectoryDrawerUtils.cc (modified) (3 diffs)

trunk/source/visualization/modeling/GNUmakefile

@@ -18 +18 @@
 include $(G4INSTALL)/config/architecture.gmk
 
-#CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_1
-#CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_2
-#CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_3
+CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_1
+CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_2
+CPPFLAGS += -DG4VIS_BUILD_OPTIMISE_3
 
 CPPFLAGS += -I$(G4BASE)/global/management/include

trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc

@@ -57 +57 @@
         for (size_t iAux=0; iAux<auxiliaries->size(); ++iAux) {
           const G4ThreeVector pos((*auxiliaries)[iAux]);
-#ifdef G4VIS_BUILD_OPTIMISE_1
           if (trajectoryLine.size() >0) {
             if (pos != trajectoryLine[trajectoryLine.size()-1]) {
@@ -63 +62 @@
               auxiliaryPoints.push_back(pos);
             }
-         } else {
-#endif
+          } else {
             trajectoryLine.push_back(pos);
             auxiliaryPoints.push_back(pos);
-#ifdef G4VIS_BUILD_OPTIMISE_1
           }
-#endif
         }
       }
       const G4ThreeVector pos(aTrajectoryPoint->GetPosition());
-#ifdef G4VIS_BUILD_OPTIMISE_1
       if (trajectoryLine.size() >0) {
         if (pos != trajectoryLine[trajectoryLine.size()-1]) {
@@ -80 +75 @@
         }
       } else {
-#endif
         trajectoryLine.push_back(pos);
         stepPoints.push_back(pos);
-#ifdef G4VIS_BUILD_OPTIMISE_1
-      }
-#endif
-    }
-  }
-
+      }
+    }
+  }
+  
   void DrawLineAndPoints(const G4VTrajectory& traj, const G4int& i_mode, const G4Colour& colour, const G4bool& visible) {
     // If i_mode>=0, draws a trajectory as a polyline (default is blue for