Changeset 393 for applications

Timestamp:

06/19/09 17:57:54 (16 years ago)

Author:

smidl

Message:

merger_mx works!

Location:

applications/bdmtoolbox/mex

Files:

• CMakeLists.txt (modified) (1 diff)
• merger.cpp (added)
• merger_mx.cpp (modified) (1 diff)

applications/bdmtoolbox/mex/CMakeLists.txt

@@ -13 +13 @@
 
 MEX(merger_mx)
+EXEC(merger)
 MEX(config2mxstruct)
 MEX(mxstruct2config)

applications/bdmtoolbox/mex/merger_mx.cpp

@@ -25 +25 @@
 
         // LOAD CONFIG
-        UImxArray Src;
-        Src.addList(input[0],"Sources");
+        UImxArray Cfg;
+        Cfg.addList(input[0],"Sources");
+        Cfg.addGroup(input[1],"Support");
+        Cfg.addGroup(input[2],"Merger");
+
+        //DBG
+        Cfg.writeFile("merger_mx.cfg");
         
-        UImxArray Sup (input[1]);
-        UImxArray Mer (input[2]);
         // Sources
         Array<mpdf*> Sources;
         //abuse Mer to store sources
-
-        Setting& _Sources=Src.lookup("Sources");
+        Setting& _Sources=Cfg.lookup("Sources");
         int Slen=_Sources.getLength();
         Sources.set_size(Slen);
         for (int i=0; i<Slen; i++){
-                mpdf* mtmp = UI::build<mpdf>(_Sources,i);
-                if (mtmp) { 
+                try{
+                        mpdf* mtmp = UI::build<mpdf>(_Sources,i);
                         Sources(i)=mtmp;
-                } else{ // source is not mpdf
-                        epdf* etmp = UI::build<epdf>(_Sources,i);
-                        if (etmp){
-                                Sources(i) = new mepdf(etmp, true);
+                }
+                catch (UIbuildException e){
+                        // it is not mpdf - see if it is epdf
+                        try {
+                                epdf* etmp = UI::build<epdf>(_Sources,i);
+                                if (etmp){
+                                        Sources(i) = new mepdf(etmp, true);
+                                }
+                                
                         }
+                        catch (...) {it_error("no mpdfs or epdfs found!");}
                 }
 
         }
 
-        merger_base* Merger=UI::build<merger_base>(Mer.getRoot());
+        merger_base* Merger=UI::build<merger_base>(Cfg,"Merger");
 
         // Support
-        Setting & _Supp=Sup.getRoot();
+        Setting & _Supp=Cfg.lookup("Support");
         
+        if (_Supp.exists("grid") &&  _Supp.exists("nbins")) {
         Array<vec> bounds (0);
         UI::get (bounds, _Supp, "grid");
         ivec nbins(0);
         UI::get (nbins, _Supp, "nbins");
+        Merger->set_support (bounds,nbins);
         
-        epdf *g0=UI::build<epdf> (_Supp, "pdf");
-        int npoints=100;
-        _Supp.lookupValue("nsamples",npoints);
-        
+        }else {
+                if (_Supp.exists("pdf") &&  _Supp.exists("nsamples")){
+                        epdf *g0=UI::build<epdf> (_Supp, "pdf");
+                        int npoints=100;
+                        _Supp.lookupValue("nsamples",npoints);
+                        Merger->set_support (*g0,npoints);
+                        delete g0;      
+                }
+                else it_error("Use either [grid,nbins] or [pdf,nsamples].");
+        }
 // COMPUTE RESULTS
         Merger->set_sources(Sources,true); // takes care of deletion of sources
-        if (bounds.length() > 0 && nbins.length()>0) {
-                Merger->set_support (bounds,nbins);
-        } else {
-                if (g0) {
-                        Merger->set_support (*g0,npoints);
-                        delete g0;
-                }
-        }
         Merger->merge();