Changeset 3149 in Sophya for trunk/SophyaPI/PIext/pawexecut.cc

Timestamp:

Jan 18, 2007, 7:21:49 PM (19 years ago)

Author:

cmv

Message:

suite adaptation travail reza 2D et adapteur + adaptation aux modifs HistoErr cmv 18/01/2007

File:

• trunk/SophyaPI/PIext/pawexecut.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/pawexecut.cc

@@ -311 +311 @@
 piac->RegisterCommand(kw,usage,this,hgrp);
 
-kw = "herr/correl";
+kw = "herr/mean";
 usage = "Perform bin mean computation for HistoErr and Histo2DErr";
-usage += "\n herr/correl nameherr todo";
+usage += "\n herr/mean nameherr todo";
 usage += "\n    todo = +1 : compute mean";
+usage += "\n         = -1 : cancel computation";
+piac->RegisterCommand(kw,usage,this,hgrp);
+
+kw = "herr/variance";
+usage = "Perform bin mean and variance computation for HistoErr and Histo2DErr";
+usage += "\n herr/variance nameherr todo";
+usage += "\n    todo = +1 : compute mean and variance";
 usage += "\n         = -1 : cancel computation";
 piac->RegisterCommand(kw,usage,this,hgrp);
@@ -382 +389 @@
 } else if(kw == "h/err") {
   h_err(tokens); return(0);
-} else if(kw == "herr/correl") {
-  herr_correl(tokens); return(0);
+} else if(kw == "herr/mean") {
+  herr_mean_variance(tokens,0); return(0);
+} else if(kw == "herr/variance") {
+  herr_mean_variance(tokens,1); return(0);
 } else return(1); 
 }
+
 
 /* methode */
@@ -2425 +2435 @@
 
 /* methode */
-void PAWExecutor::herr_correl(vector<string>& tokens)
-// Pour appliquer ToCorrel ou FromCorrel a un HistoErr ou Histo2DErr
+void PAWExecutor::herr_mean_variance(vector<string>& tokens,int var)
+// Pour appliquer ToMean ou FromMean a un HistoErr ou Histo2DErr
+// Pour appliquer ToVariance ou FromVariance a un HistoErr ou Histo2DErr
 {
   int_4 tks = tokens.size();
-  if(tks<1)
-    {cout<<"Usage: herr_correl namehisterr [+1,-1]"<<endl;
-     return;}
+  if(tks<1) {
+    cout<<"Usage: herr_mean_variance namehisterr [+1,-1]"<<endl;
+    return;
+  }
 
   NamedObjMgr omg;
@@ -2446 +2458 @@
 
   if(sens>=0) {
-    if(herr) herr->ToCorrel();
-    else if(herr2) herr2->ToCorrel();
+    if(herr) {if(var==1) herr->ToVariance(); else herr->ToMean();}
+    else if(herr2) {if(var==1) herr2->ToVariance(); else herr2->ToMean();}
   } else {
-    if(herr) herr->FromCorrel();
-    else if(herr2) herr2->FromCorrel();
+    if(herr) {if(var==1) herr->FromVariance(); else herr->FromMean();}
+    else if(herr2) {if(var==1) herr2->FromVariance(); else herr2->FromMean();}
   }
 
-  int ncorrel = 0;
-  if(herr) ncorrel = herr->NCorrel();
-  else if(herr2) ncorrel = herr2->NCorrel();
-  cout<<tokens[0]<<" : ncorrel = "<<ncorrel<<endl;
-
-}
+  int nmean = 0;
+  if(herr) nmean = herr->NMean();
+  else if(herr2) nmean = herr2->NMean();
+  cout<<tokens[0]<<" : nmean = "<<nmean<<endl;
+
+}