Changeset 2681 in Sophya

Timestamp:

Apr 20, 2005, 7:03:24 PM (20 years ago)

Author:

cmv

Message:

1-/ pour n/proj pas de display si histo existe ET pas d'option graphiques donnees
2-/ gestion correcte de la superposition d'histo 1D dans n/plot nt.x

L'histo pour le 2ieme display est dimensionne comme le premier.

(ajout de l'option graphique keepbin)

cmv 20/04/2005

Location:

trunk/SophyaPI/PIext

Files:

• pawexecut.cc (modified) (4 diffs)
• servnobjm.cc (modified) (10 diffs)

trunk/SophyaPI/PIext/pawexecut.cc

@@ -19 +19 @@
 #include "nomgadapter.h"
 #include "pistdimgapp.h"
+#include "pihisto.h"
 
 #ifdef SANS_EVOLPLANCK
@@ -45 +46 @@
 
 kw = "n/plot";
-usage = "Plot NTuple variables a la paw (alias n/pl)";
+usage = "Plot NTuple variables \"a la paw\" (alias n/pl)";
 usage += "\n n/plot nameobj.x_exp [cut] [w_exp] [loop] [gratt]";
 usage += "\n n/plot nameobj.y_exp%x_exp [cut] [loop] [gratt]";
 usage += "\n n/plot nameobj.z_exp%y_exp%x_exp [cut] [loop] [gratt]";
 usage += "\n        for default use ! , loop=i1[:i2[:di]]";
+usage += "\n for 1 dimensional (1D) projection:";
+usage += "\n   use graphic option \"keepbin\" to superimpose";
+usage += "\n   1D distribution with the same binning";
 usage += "\n  Related commands: plot2dw plot3d";  
 piac->RegisterCommand(kw,usage,this,hgrp);
@@ -58 +62 @@
 usage += "\n n/proj nameproj nameobj.y_exp%x_exp [cut] [w_exp] [loop] [gratt]";
 usage += "\n        for default use ! , loop=i1[:i2[:di]]";
+usage += "\n for 1 dimensional (1D) projection:";
+usage += "\n   no display is performed if \"nameproj\" is an existing histogram";
+usage += "\n   unless a graphic option \"gratt\" is given";
 usage += "\n  Related commands: projh1d projh2d projprof exptovec";  
 piac->RegisterCommand(kw,usage,this,hgrp);
@@ -375 +382 @@
       nameproj += buff;
     }
+    // --- Si option "keepbin" on projete avec le meme binning que l'histo 1D precedent
+    if(dopt.find("keepbin")<dopt.size()) {
+      PIStdImgApp* piimapp = omg.GetImgApp();
+      if(piimapp) {
+        PIBaseWdg* pibwdg = piimapp->CurrentBaseWdg();
+        if(pibwdg) {
+          int nbdrw = pibwdg->NbDrawers();
+          if(nbdrw>0) {
+            for(int i=nbdrw-1;i>=0;i--) {
+              PIDrawer* pidwr = pibwdg->GetDrawer(i);
+              PIHisto* pih = NULL;
+              if( (pih = dynamic_cast<PIHisto *>(pidwr))==NULL ) continue;
+              Histo* h = pih->Histogram();
+              if(h==NULL) continue;
+              if(h->NBins()<1) continue;
+              Histo* hsame = new Histo(h->XMin(),h->XMax(),h->NBins());
+              omg.AddObj(hsame,nameproj);
+              // on force donc le display sur le meme plot
+              dopt += " same";
+              break;
+            }
+          }
+        }
+      }
+    }
+    // --- 
   }
   srvo->ProjectH1(nameobj,expx,expwt,expcut,nameproj,dopt,loop);

trunk/SophyaPI/PIext/servnobjm.cc

@@ -500 +500 @@
   cout << "Services2NObjMgr::ProjectH1() Error , No such object " << nom << endl; 
   return;
-  }
+}
 if (!mImgapp)  return; 
 
@@ -516 +516 @@
   char* ntn[2]= {"hxval", "hwt"};
   nt = new NTuple(2,ntn);  // Creation NTuple 
-  }
+}
 string expz = "0.";   
 ComputeExpressions(obja, expx, expwt, expz, expwt, expcut, loop, nt, h1, NULL);
@@ -526 +526 @@
     delete nt;
     return;
-    }
+  }
   double xmin, xmax;
   nt->GetMinMax(0, xmin, xmax);
@@ -535 +535 @@
     xn = nt->GetVec(k);
     h1->Add(xn[0], xn[1]);    
-    }
+  }
   delete nt;
   MyObjMgr()->AddObj(h1, nomh1);
-  }
-
-if(!h1_already_exist) MyObjMgr()->DisplayObj(nomh1, dopt);
+}
+
+if(!h1_already_exist || dopt.size()>0) MyObjMgr()->DisplayObj(nomh1, dopt);
 return;  
 }
@@ -553 +553 @@
   cout << "Services2NObjMgr::ProjectH2() Error , No such object " << nom << endl; 
   return;
-  }
+}
 if (!mImgapp)  return; 
 
@@ -569 +569 @@
   char* ntn[3]= {"hxval", "hyval", "hwt"};
   nt = new NTuple(3,ntn);  // Creation NTuple 
-  }
+}
 string expz = "0.";   
 ComputeExpressions(obja, expx, expy, expwt, expwt, expcut, loop, nt, NULL, h2);
@@ -579 +579 @@
     delete nt;
     return;
-    }
+  }
   double xmin, xmax, ymin, ymax;
   nt->GetMinMax(0, xmin, xmax);
@@ -589 +589 @@
     xn = nt->GetVec(k);
     h2->Add(xn[0], xn[1], xn[2]);    
-    }
+  }
   delete nt;
   MyObjMgr()->AddObj(h2, nomh2);
-  }
-
-if(!h2_already_exist) MyObjMgr()->DisplayObj(nomh2, dopt);
+}
+
+if(!h2_already_exist || dopt.size()>0) MyObjMgr()->DisplayObj(nomh2, dopt);
 return;  
 
@@ -618 +618 @@
   cout << "Services2NObjMgr::ProjectHProf() Error , No such object " << nom << endl; 
   return;
-  }
+}
 if (!mImgapp)  return; 
 
@@ -652 +652 @@
     xn = nt->GetVec(k);
     hprof->Add(xn[0], xn[1], xn[2]);
-    }
+  }
   delete nt;
   MyObjMgr()->AddObj(hprof, nomprof);
-  }
+}
 hprof->UpdateHisto();
 
-if(!hp_already_exist) MyObjMgr()->DisplayObj(nomprof, dopt);
+if(!hp_already_exist || dopt.size()>0) MyObjMgr()->DisplayObj(nomprof, dopt);
 return;
 }