Changeset 2252 in Sophya for trunk/SophyaPI/ProgPI

Timestamp:

Nov 7, 2002, 11:16:18 AM (23 years ago)

Author:

perderos

Message:

Modif pour donner un nom a l'objet cree par fitsadapt
different du nom par defaut

O Perdereau 07/11/2002

File:

• trunk/SophyaPI/ProgPI/fitsbtadapter.cc (modified) (2 diffs)

trunk/SophyaPI/ProgPI/fitsbtadapter.cc

@@ -105 +105 @@
 string kw = "fitsadapt";
 string usage = "fitsadapt: NTuple adaptor for Binary and ASCII Fits table\n" ;
-usage += "Usage: fitsadapt fitsfile [hdu buflen[,bufsens,lp]]";
+usage += "Usage: fitsadapt fitsfile [nomobj hdu buflen[,bufsens,lp]]";
 usage += "\n fitsfile : Fits file name";
+usage += "\n nomobj : Object name (needed if file name misleading as C++ variable)";
 usage += "\n hdu : Fits HDU (if <=0 take first binary/ascii table)";
 usage += "\n buflen[,bufsens,lp] : buffer length (sens) for fits reading (default is 100,1,0)";
@@ -121 +122 @@
 if(kw == "fitsadapt") {
   if(tokens.size()<1)
-    {cout<<"Usage: fitsadapt fitsfile [hdu buflen[,bufsens]]"<<endl;
+    {cout<<"Usage: fitsadapt fitsfile [nomobj hdu buflen[,bufsens]]"<<endl;
      return(0);}
     int ihdu=0;
     int_4 buflen=100, bufsens=1, lp=0;
     string fname = tokens[0];
-    if(tokens.size()>1) sscanf(tokens[1].c_str(),"%d",&ihdu);
-    if(tokens.size()>2) sscanf(tokens[2].c_str(),"%d,%d,%d",&buflen,&bufsens,&lp);
+    string nom_obj ="";
+    if(tokens.size()>1) nom_obj = tokens[1];
+    if(tokens.size()>2) sscanf(tokens[2].c_str(),"%d",&ihdu);
+    if(tokens.size()>3) sscanf(tokens[3].c_str(),"%d,%d,%d",&buflen,&bufsens,&lp);
     FitsBTNtuIntf* fbt = new FitsBTNtuIntf(fname,ihdu,buflen,bufsens,lp);
-    fname = omg.GetServiceObj()->FileName2Name(fname);
-    omg.AddObj(fbt,fname);
+
+    if(nom_obj=="" || nom_obj=="!") nom_obj = omg.GetServiceObj()->FileName2Name(fname);
+    omg.AddObj(fbt,nom_obj);
  }
  return(0);