Changeset 507 for library/bdm/base/bdmbase.cpp

Timestamp:

08/12/09 15:37:43 (15 years ago)

Author:

vbarta

Message:

removed class compositepdf; keeping mpdfs of mprod and merger_base in shared pointers

Files:

• library/bdm/base/bdmbase.cpp (modified) (2 diffs)

library/bdm/base/bdmbase.cpp

@@ -306 +306 @@
 }
 
-RV compositepdf::getrv ( bool checkoverlap ) {
+RV get_composite_rv ( const Array<shared_ptr<mpdf> > &mpdfs,
+                      bool checkoverlap ) {
         RV rv; //empty rv
         bool rvaddok;
@@ -312 +313 @@
                 rvaddok = rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
                 // If rvaddok==false, mpdfs overlap => assert error.
-                it_assert_debug ( rvaddok || ( !checkoverlap ), "mprod::mprod() input mpdfs overlap in rv!" );
-        };
+                it_assert_debug ( rvaddok || !checkoverlap, "mprod::mprod() input mpdfs overlap in rv!" );
+        }
+
         return rv;
-}
-
-void compositepdf::setrvc ( const RV &rv, RV &rvc ) {
-        for ( int i = 0; i < mpdfs.length(); i++ ) {
-                RV rvx = mpdfs ( i )->_rvc().subt ( rv );
-                rvc.add ( rvx ); //add rv to common rvc
-        };
 }