Changeset 449 in Sophya for trunk/SophyaPI


Ignore:
Timestamp:
Oct 1, 1999, 3:47:18 PM (26 years ago)
Author:
ercodmgr
Message:

Fin lecture NtupleASCII, amelioration/niveau de print ds NamedObjMgr Reza 1/10/99

Location:
trunk/SophyaPI/PIext
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/basexecut.cc

    r447 r449  
    551551    return(0);
    552552    }
    553   cout<<"CMV -> Reza tu dois mettre ici (def_val) la valeur par defaut"<<endl;
    554553  double def_val = 0.;
    555554  if(tokens.size()>=3) def_val = atof(tokens[2].c_str());
    … …  
    718717usage += "\n  Related commands: saveobj openppf savefits"; 
    719718mpiac->RegisterCommand(kw, usage, this, "FileIO");
     719kw = "ntfrascii";
     720usage = "Fills an existing NTuple from ASCII table file";
     721usage += "\n Usage: ntfrascii nt_name file_name [def_init_val]";
     722usage += "\n  Related commands: ntloop fillnt ";
     723mpiac->RegisterCommand(kw, usage, this, "FileIO");
     724
    720725
    721726kw = "print";
    … …  
    918923mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
    919924
    920 kw = "ntfrascii";
    921 usage = "Fills an existing NTuple from ASCII table file";
    922 usage += "\n Usage: ntfrascii nt_name file_name [def_init_val]";
    923 usage += "\n  Related commands: ntloop fillnt ";
    924 mpiac->RegisterCommand(kw, usage, this, "Expr. Plotting");
    925 
    926925kw = "fillnt";
    927926usage = "Creates and Fills an NTuple(x,y,z,t) with (X=f(Object),Y=g(...),Z=h(...),T=k(...))";

  • trunk/SophyaPI/PIext/nobjmgr.cc

    r440 r449  
    8686static string* TmpDir;  // Repertoire pour les compilations / link dynamique
    8787
    88 static bool BeQuiet = false;  // Moins de messages ...
    8988
    9089// Pour completer le nom de l'objet avec le nom du repertoire
    … …  
    172171}
    173172
     173
     174static bool verbeux = false;  // true -> plus de message (creation/suppression d'objets)
     175void NamedObjMgr::SetVerbose(bool fg)
     176{
     177verbeux = fg;
     178}
     179
    174180/* --Methode-- */
    175181PIStdImgApp* NamedObjMgr::GetImgApp()
    … …  
    207213  (myImgApp->ObjMgrW())->AddDirectory(str.c_str(), myDirId);
    208214  }
    209 cout << "NamedObjMgr::CreateDir() " << dirname << " Created " << endl;
     215if (verbeux) cout << "NamedObjMgr::CreateDir() " << dirname << " Created " << endl;
    210216return(true);
    211217}
    … …  
    239245  (myImgApp->ObjMgrW())->DelDirectory((*it).second.id);
    240246myDirs->erase(it);
    241 cout << "NamedObjMgr::DeleteDir() " << dirname << " deleted " << endl; 
     247if (verbeux) cout << "NamedObjMgr::DeleteDir() " << dirname << " deleted " << endl; 
    242248return(true);
    243249}
    … …  
    250256if (it == myDirs->end()) return;
    251257(*it).second.lock = true;
    252 cout << "NamedObjMgr::LockDir() " << dirname << " Locked " << endl;
     258if (verbeux) cout << "NamedObjMgr::LockDir() " << dirname << " Locked " << endl;
    253259return;
    254260}
    … …  
    261267if (it == myDirs->end()) return;
    262268(*it).second.lock = true;
    263 cout << "NamedObjMgr::UnlockDir() " << dirname << " Unlocked " << endl;
     269if (verbeux) cout << "NamedObjMgr::UnlockDir() " << dirname << " Unlocked " << endl;
    264270return;
    265271}
    … …  
    272278if (it == myDirs->end()) return;
    273279(*it).second.keepold = keepold;
     280if (!verbeux) return;
    274281cout << "NamedObjMgr::SetKeepOldDirAtt() " << dirname << "  ->  ";
    275282if ( keepold ) cout << " True " << endl;
    … …  
    292299  }
    293300*currDir = dirname;
    294 cout << "NamedObjMgr::SetCurrentDir() -> " << dirname << endl;
     301if (verbeux) cout << "NamedObjMgr::SetCurrentDir() -> " << dirname << endl;
    295302return(true);
    296303}
    … …  
    413420// Si c'est le repertoire /func, on nettoie
    414421if (nrep == "func")  {
    415   BeQuiet = true;   
    416422  CleanDir(nrep);
    417   BeQuiet = false;
    418423  }
    419424
    … …  
    459464(*itr).second.nobj++;
    460465
    461 cout << "NamedObjMgr::AddObj()  Object " << nom << " ( " 
     466if (verbeux) cout << "NamedObjMgr::AddObj()  Object " << nom << " ( " 
    462467     << typeid(*obj).name() << " ) added (Total= " << myObjs->size() << ")" << endl; 
    463468return(true);
    … …  
    505510itr = myDirs->find(r2);
    506511(*itr).second.nobj++;
    507 cout << "NamedObjMgr::RenameObj() - Object " << nom << " renamed to " << nomnew << endl;
     512if (verbeux)
     513  cout << "NamedObjMgr::RenameObj() - Object " << nom << " renamed to " << nomnew << endl;
    508514return(true);
    509515}
    … …  
    534540(*itr).second.nobj--;
    535541
    536 if (BeQuiet) return(true); 
     542if (!verbeux) return(true); 
    537543if (fgd) cout << "NamedObjMgr::DelObj()  Object " << nom << " deleted (Total= " << myObjs->size() << ")" << endl;
    538544else  cout << "NamedObjMgr::DelObj()  Object " << nom << " removed (Total= " << myObjs->size() << ")" << endl;
    … …  
    686692string nom;
    687693
     694int nread = 0;
    688695if ( (s.NbTags() < 1) || (num >= s.NbTags()) ) {
    689696  if (num >= 0) {
    … …  
    701708  nom = "";
    702709  AddObj(obj->DataObj(), nom);
     710  nread++;
    703711}
    704712 
    … …  
    717725    ok = false;
    718726  } ENDTRY;
    719   if (ok)  AddObj(obj->DataObj(), nom, true); 
    720 }
    721 
     727  if (ok)  { AddObj(obj->DataObj(), nom, true);  nread++; }
     728}
     729
     730cout << "NamedObjMgr::ReadObj(...) " << nread << " Objects read " << endl;
    722731return;
    723732}
    … …  
    919928obja = GetObjAdapter(nom);
    920929if (obja == NULL) {
    921   cout << "NamedObjMgr::DisplayImage() Error , Pas d'objet de nom " << nom << endl;
     930  cout << "NamedObjMgr::DisplayImage() Error , No such object " << nom << endl;
    922931  return;
    923932}
    … …  
    928937if (!arr) {
    929938  string ctyp = typeid(*(obja->GetDataObj())).name();
    930   cout << "NamedObjMgr::DisplayImage() Error , Non supporte pour " << ctyp << endl;
     939  cout << "NamedObjMgr::DisplayImage() Error , Not supported for " << ctyp << endl;
    931940  return;
    932941  }
    … …  
    954963obja = GetObjAdapter(nom);
    955964if (obja == NULL) {
    956   cout << "NamedObjMgr::DisplayImage() Error , Pas d'objet de nom " << nom << endl;
     965  cout << "NamedObjMgr::DisplaySurf3D() Error , No such object " << nom << endl;
    957966  return;
    958967}
    … …  
    963972if (!arr) {
    964973  string ctyp = typeid(*(obja->GetDataObj())).name();
    965   cout << "NamedObjMgr::DisplaySurf3D() Error , Non supporte pour " << ctyp << endl;
     974  cout << "NamedObjMgr::DisplaySurf3D() Error , Not supported " << ctyp << endl;
    966975  return;
    967976  }
    … …  
    969978if ((arr->XSize() > 250) || (arr->YSize() > 250)) {
    970979  cout << "NamedObjMgr::DisplaySurf3D() Error , 2D-Array(" <<  arr->XSize()
    971        << "x" << arr->YSize() << ") trop grand (max=250x250)" << endl;
     980       << "x" << arr->YSize() << ") too big (max=250x250)" << endl;
    972981  delete arr;
    973982  return;
    … …  
    9981007AnyDataObj* obj=GetObj(nom);
    9991008if (obj == NULL) {
    1000   cout << "NamedObjMgr::DisplayNT() Error , Pas d'objet de nom " << nom << endl;
     1009  cout << "NamedObjMgr::DisplayNT() Error , No such object " << nom << endl;
    10011010  return;
    10021011}
    … …  
    10071016// if (typeid(*obj) != typeid(NTupleInterface)) {
    10081017  string ctyp = typeid(*obj).name();
    1009   cout << "NamedObjMgr::DisplayNT() Error , Objet n'est pas un NTuple " << ctyp << endl;
     1018  cout << "NamedObjMgr::DisplayNT() Error , Object not an NTuple " << ctyp << endl;
    10101019  return;
    10111020  }
    … …  
    10611070AnyDataObj* obj=GetObj(nom);
    10621071if(obj == NULL)
    1063   {cout << "NamedObjMgr::DisplayGFD() Error , Pas d'objet de nom " << nom << endl;
     1072  {cout << "NamedObjMgr::DisplayGFD() Error , No such object " << nom << endl;
    10641073   return;}
    10651074if(!myImgApp) return;
    10661075if(typeid(*obj) != typeid(GeneralFitData))
    10671076  {string ctyp = typeid(*obj).name();
    1068    cout<<"NamedObjMgr::DisplayGFD() Error , Objet n'est pas un GeneralFitData "<<ctyp<<endl;
     1077   cout<<"NamedObjMgr::DisplayGFD() Error , Object not a GeneralFitData "<<ctyp<<endl;
    10691078   return;}
    10701079

  • trunk/SophyaPI/PIext/nobjmgr.h

    r440 r449  
    2525
    2626  virtual void          SetImgApp(PIStdImgApp* app);
     27  virtual void          SetVerbose(bool fg=false);
    2728
    2829

  • trunk/SophyaPI/PIext/piacmd.cc

    r384 r449  
    480480
    481481// >>>> Substitution d'alias (1er mot)
    482 int als = 0;
    483 while (als < 2) {
    484   p = s.find_first_not_of(" ");
    485   s = s.substr(p);
     482p = 0;
     483q = s.find_first_of(" \t");
     484l = s.length();
     485string w1 =  (q < l) ? s.substr(p,q-p) : s.substr(p);
     486it = mAliases.find(w1);
     487if (it != mAliases.end())  {
     488  s =  (q < l) ? ((*it).second + s.substr(q)) : (*it).second ;
     489  l = s.length();
     490  p=s.find_first_not_of(" \t");
     491  if (p < l) s = s.substr(p);
    486492  p = 0;
    487493  q = s.find_first_of(" ");
    488   l = s.length();
    489   string w1 =  (q < l) ? s.substr(p,q-p) : s.substr(p);
    490   it = mAliases.find(w1);
    491   if (it != mAliases.end())  s =  (*it).second + s.substr(q);
    492   else als++;
    493   als++;
    494494  }
    495495

  • trunk/SophyaPI/PIext/pistdimgapp.cc

    r440 r449  
    101101m[5]->AppendCheckItem("Catch SigFPE", 10603);
    102102m[5]->AppendCheckItem("Catch SigSEGV", 10604);
     103m[5]->AppendCheckItem("ObjMgr Verb", 10605);
    103104
    104105m[6] = new PIMenu(Menubar(),"Modules");
    … …  
    150151mObjMgr = new NamedObjMgr;
    151152mCmd = new PIACmd(mObjMgr, this);
     153
     154// Pas trop de message de la part de NamedObjMgr
     155m[5]->SetStateMsg(10605, false);
     156mObjMgr->SetVerbose(false);
    152157
    153158char* varenv;
    … …  
    12111216    CatchSignals(m[5]->GetStateMsg(10603), m[5]->GetStateMsg(10604));
    12121217    break;
     1218  case 10605:
     1219    mObjMgr->SetVerbose(m[5]->GetStateMsg(10605));
     1220    break;
    12131221  default:
    12141222    cerr << "PIStdImgApp::MBProcess6() BUG?? Msg= " <<  msg << endl;   

  • trunk/SophyaPI/PIext/servnobjm.cc

    r447 r449  
    9494if ((fip = fopen(fname.c_str(), "w")) == NULL)   {
    9595  string sn = fname;
    96   cout << "Services2NObjMgr/PlotFunc_Erreur: Pb. Ouverture " << sn << endl;
     96  cout << "Services2NObjMgr/PlotFunc_Error: fopen( " << sn << endl;
    9797  return;
    9898  }
    … …  
    129129if ((fip = fopen(fname.c_str(), "w")) == NULL)   {
    130130  string sn = fname;
    131   cout << "Services2NObjMgr/PlotFunc2D_Erreur: Pb. Ouverture " << sn << endl;
     131  cout << "Services2NObjMgr/PlotFunc2D_Error:  fopen( " << sn << endl;
    132132  return;
    133133  }
    … …  
    287287obja = mOmg->GetObjAdapter(nom);
    288288if (obja == NULL) {
    289   cout << "Services2NObjMgr::DisplayPoints2D() Error , Pas d'objet de nom " << nom << endl;
     289  cout << "Services2NObjMgr::DisplayPoints2D() Error , No such object " << nom << endl;
    290290  return;
    291291  }
    … …  
    330330obja = mOmg->GetObjAdapter(nom);
    331331if (obja == NULL) {
    332   cout << "Services2NObjMgr::DisplayPoints3D() Error , Pas d'objet de nom " << nom << endl;
     332  cout << "Services2NObjMgr::DisplayPoints3D() Error , No such object " << nom << endl;
    333333  return;
    334334  }
    … …  
    372372obja = mOmg->GetObjAdapter(nom);
    373373if (obja == NULL) {
    374   cout << "Services2NObjMgr::DisplayPoints2DW() Error , Pas d'objet de nom " << nom << endl;
     374  cout << "Services2NObjMgr::DisplayPoints2DW() Error , No such object " << nom << endl;
    375375  return;
    376376  }
    … …  
    408408obja = mOmg->GetObjAdapter(nom);
    409409if (obja == NULL) {
    410   cout << "Services2NObjMgr::ProjectH1() Error , Pas d'objet de nom " << nom << endl;
     410  cout << "Services2NObjMgr::ProjectH1() Error , No such object " << nom << endl;
    411411  return;
    412412  }
    … …  
    457457obja = mOmg->GetObjAdapter(nom);
    458458if (obja == NULL) {
    459   cout << "Services2NObjMgr::ProjectH2() Error , Pas d'objet de nom " << nom << endl;
     459  cout << "Services2NObjMgr::ProjectH2() Error , No such object " << nom << endl;
    460460  return;
    461461  }
    … …  
    518518obja = mOmg->GetObjAdapter(nom);
    519519if (obja == NULL) {
    520   cout << "Services2NObjMgr::ProjectHProf() Error , Pas d'objet de nom " << nom << endl;
     520  cout << "Services2NObjMgr::ProjectHProf() Error , No such object " << nom << endl;
    521521  return;
    522522  }
    … …  
    670670obja = mOmg->GetObjAdapter(nom);
    671671if (obja == NULL) {
    672   cout << "Services2NObjMgr::ExpressionToVector() Error , Pas d'objet de nom " << nom << endl;
     672  cout << "Services2NObjMgr::ExpressionToVector() Error , No such object " << nom << endl;
    673673  return;
    674674  }
    … …  
    723723
    724724NTuple* nt = (NTuple*) mobj;
    725 cout<<"CMV -> Reza tu dois mofidier FillFromASCIIFile"<<endl;
    726 cout<<"CMV -> Reza pour permettre une valeur par defaut"<<endl;
    727 cout<<"CMV -> Reza n oublie AUSSI pas l arg par def dans servnobj.h"<<endl;
    728 cout<<"CMV -> Reza > nt->FillFromASCIIFile(filename,def_val);"<<endl;
    729 nt->FillFromASCIIFile(filename);
     725nt->FillFromASCIIFile(filename, def_val);
    730726return;
    731727}
    … …  
    738734obja = mOmg->GetObjAdapter(nom);
    739735if (obja == NULL) {
    740   cout << "Services2NObjMgr::FillNT() Error , Pas d'objet de nom " << nom << endl;
     736  cout << "Services2NObjMgr::FillNT() Error , No such object " << nom << endl;
    741737  return;
    742738  }
    … …  
    751747  nt = (NTuple*)oh;
    752748  if (nt->NVar() > 10) {
    753     cout << "Services2NObjMgr::FillNT() Warning , Max 10 var ds NTuple -> new NTuple" << endl;
     749    cout << "Services2NObjMgr::FillNT() Warning , Max 10 var in NTuple -> new NTuple" << endl;
    754750    nt = NULL;
    755751    }
    … …  
    783779NTupleInterface* objnt = obja->GetNTupleInterface(adel);
    784780if (objnt == NULL)  {
    785   cout << "Services2NObjMgr::FillNTFrCFile( " << nom << "...) No NTupleInterface !" <<endl;
     781  cout << "Services2NObjMgr::FillNTFrCFile( " << nom << "...) Not an NTupleInterface !" <<endl;
    786782  return;
    787783  }
    … …  
    802798    nt = (NTuple*)oh;
    803799    if (nt->NVar() > 10) {
    804       cout << "Services2NObjMgr::FillNTFrCFile() Warning , Max 10 var ds NTuple -> new NTuple" << endl;
     800      cout << "Services2NObjMgr::FillNTFrCFile() Warning , Max 10 var in NTuple -> new NTuple" << endl;
    805801      nt = NULL;
    806802      }
    … …  
    945941obja = mOmg->GetObjAdapter(nom);
    946942if (obja == NULL) {
    947   cout << "Services2NObjMgr::FillGFD() Error , Pas d'objet de nom "<<nom<<endl;
     943  cout << "Services2NObjMgr::FillGFD() Error , No such object "<<nom<<endl;
    948944  return;
    949945  }
    … …  
    10621058if ((fip = fopen(fname.c_str(), "w")) == NULL)   {
    10631059  string sn = fname;
    1064   cout << "Services2NObjMgr/LinkExprFunc_Erreur: Pb. Ouverture " << sn << endl;
     1060  cout << "Services2NObjMgr/LinkExprFunc_Error: fopen( " << sn << endl;
    10651061  return(NULL);
    10661062  }
Note: See TracChangeset for help on using the changeset viewer.