Changeset 2605 in Sophya

Timestamp:

Sep 3, 2004, 6:25:13 PM (21 years ago)

Author:

cmv

Message:

intro PARTIELLE de HistoErr cmv 3/9/04

Location:

trunk/SophyaPI/PIext

Files:

• nomhistadapter.cc (modified) (3 diffs)
• nomhistadapter.h (modified) (2 diffs)
• pawexecut.cc (modified) (2 diffs)
• piinit.cc (modified) (1 diff)
• servnobjm.cc (modified) (1 diff)

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -17 +17 @@
 #endif
 
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Histo / HProf
-//-------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Histo / HProf / HistoErr
+//-----------------------------------------------------------------------------
 
 /* --Methode-- */
@@ -45 +45 @@
 {
 HProf * hp = dynamic_cast<HProf *>(mHis);
-if(hp) return("HProf "); else return("Histo ");
+HistoErr * herr = dynamic_cast<HistoErr *>(mHis);
+if(hp) return("HProf ");
+else if(herr) return("HistoErr ");
+else return("Histo ");
 }
 
@@ -78 +81 @@
 mHis->UpdateHisto();  // pour le cas ou c'est un HProf
 HProf * hp = dynamic_cast<HProf *>(mHis);
-if(hp==NULL) return( new Histo(*mHis) );
-return( new HProf(*hp) );
+HistoErr * herr = dynamic_cast<HistoErr *>(mHis);
+if(hp) return( new HProf(*hp) );
+else if(herr) return( new HistoErr(*herr) );
+else return( new Histo(*mHis) );
 }
 

trunk/SophyaPI/PIext/nomhistadapter.h

@@ -11 +11 @@
 #include "histos2.h"
 #include "hisprof.h"
+#include "histerr.h"
 #include "ntuple.h"
 #include "xntuple.h"
 
-//-------------------------------------------------------------------------
-// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Histo / HProf
-//-------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Histo / HProf / HistoErr
+//-----------------------------------------------------------------------------
 
 class NOMAdapter_Histo : public NObjMgrAdapter {
@@ -51 +52 @@
 };
 
-// Class Interface NTuple pour Histo / HProf
+// Class Interface NTuple pour Histo / HProf / HistoErr
 class NTupInt_Histo : public NTupleInterface {
 public:

trunk/SophyaPI/PIext/pawexecut.cc

@@ -9 +9 @@
 #include "histos2.h"
 #include "hisprof.h"
+#include "histerr.h"
 #include "ntuple.h"
 
@@ -294 +295 @@
 //ob->DataBlock().Reset(0.);}
 #endif
-else if(typeid(*mobj)==typeid(Histo))   {Histo*   ob=(Histo*)  mobj; ob->Zero();}
-else if(typeid(*mobj)==typeid(HProf))   {HProf*   ob=(HProf*)  mobj; ob->Zero();}
-else if(typeid(*mobj)==typeid(Histo2D)) {Histo2D* ob=(Histo2D*)mobj; ob->Zero();}
+else if(typeid(*mobj)==typeid(Histo))    {Histo* ob=(Histo*)  mobj; ob->Zero();}
+else if(typeid(*mobj)==typeid(HProf))    {HProf* ob=(HProf*)  mobj; ob->Zero();}
+else if(typeid(*mobj)==typeid(HistoErr)) {HistoErr* ob=(HistoErr*)  mobj; ob->Zero();}
+else if(typeid(*mobj)==typeid(Histo2D))  {Histo2D* ob=(Histo2D*)mobj; ob->Zero();}
 else {
   cout<<"PAWExecutor::reset Error , No reset possible on "<<ctyp<<endl;

trunk/SophyaPI/PIext/piinit.cc

@@ -42 +42 @@
   serv->RegisterClass(new Histo, new NOMAdapter_Histo );
   serv->RegisterClass(new HProf, new NOMAdapter_Histo );
+  serv->RegisterClass(new HistoErr, new NOMAdapter_Histo );
   serv->RegisterClass(new Histo2D, new NOMAdapter_Histo2D );
   serv->RegisterClass(new NTuple, new NOMAdapter_NTuple );

trunk/SophyaPI/PIext/servnobjm.cc

@@ -1390 +1390 @@
   case ClassId_HProf : 
     return("HProf");
+  case ClassId_HistoErr : 
+    return("HistoErr");
   case ClassId_NTuple : 
     return("NTuple");