Changeset 2781 in Sophya for trunk/SophyaPI/PIext


Ignore:
Timestamp:
May 30, 2005, 10:00:17 AM (20 years ago)
Author:
ansari
Message:

1/ Separation de basexecut.cc en deux : commandes graphiques mises ds graphexecut.cc .h
2/ Finalisation commandes bargraph et textdrawer ds graphexecut.cc
3/ Adaptation piacmd.cc , suppression limite a 250 ds func2d et MAJ MAkefile et objlist.list

Reza 30 Mai 2005

Location:
trunk/SophyaPI/PIext
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/Makefile

    r2765 r2781  
    44 
    55clean:
    6          rm -f $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nommatvecadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomstladapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pistlist.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o $(SOPHYAOBJP)userfitfunex.o
     6         rm -f $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)graphexecut.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nommatvecadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomstladapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pistlist.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o $(SOPHYAOBJP)userfitfunex.o
    77        rm -f $(SOPHYALIBP)libPIext.a
    88 
    9 $(SOPHYALIBP)libPIext.a : $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o
     9$(SOPHYALIBP)libPIext.a : $(SOPHYAOBJP)basexecut.o $(SOPHYAOBJP)contmodex.o $(SOPHYAOBJP)cxxexecutor.o $(SOPHYAOBJP)cxxexecwin.o $(SOPHYAOBJP)flowmodex.o $(SOPHYAOBJP)graphexecut.o $(SOPHYAOBJP)nobjmgr.o $(SOPHYAOBJP)nomgadapter.o $(SOPHYAOBJP)nomgfdadapter.o $(SOPHYAOBJP)nomhistadapter.o $(SOPHYAOBJP)nomimagadapter.o $(SOPHYAOBJP)nomskymapadapter.o $(SOPHYAOBJP)nomspecrespadapter.o $(SOPHYAOBJP)nomtarradapter.o $(SOPHYAOBJP)nomtmatvecadapter.o $(SOPHYAOBJP)pawexecut.o $(SOPHYAOBJP)pi2dvec.o $(SOPHYAOBJP)piacmd.o $(SOPHYAOBJP)piafitting.o $(SOPHYAOBJP)pigfd1.o $(SOPHYAOBJP)pigfd2.o $(SOPHYAOBJP)pihisto.o $(SOPHYAOBJP)pihisto2d.o $(SOPHYAOBJP)piinit.o $(SOPHYAOBJP)pintup3d.o $(SOPHYAOBJP)pintuple.o $(SOPHYAOBJP)pipodrw.o $(SOPHYAOBJP)pisiadw.o $(SOPHYAOBJP)pistdimgapp.o $(SOPHYAOBJP)pitvmaad.o $(SOPHYAOBJP)servnobjm.o
    1010        $(AR) $(ARFLAGS) $@ $?
    1111        touch $(SOPHYAINCP)/SophyaConfInfo/libPI.objlist
    1212 
    13 $(SOPHYAOBJP)basexecut.o: basexecut.cc \
    14   $(SOPHYAINCP)sopnamsp.h piacmd.h \
    15   $(SOPHYAINCP)machdefs.h \
     13$(SOPHYAOBJP)basexecut.o: basexecut.cc $(SOPHYAINCP)sopnamsp.h piacmd.h \
     14  $(SOPHYAINCP)machdefs.h \
     15  $(SOPHYAINCP)osx_values.h \
    1616  $(SOPHYAINCP)commander.h \
    17   $(SOPHYAINCP)pdlmgr.h \
    18   $(SOPHYAINCP)dvlist.h \
     17  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)dvlist.h \
    1918  $(SOPHYAINCP)objfio.h \
    2019  $(SOPHYAINCP)anydataobj.h \
    … …  
    2524  $(SOPHYAINCP)rawstream.h \
    2625  $(SOPHYAINCP)ppfnametag.h \
    27   $(SOPHYAINCP)mutyv.h \
    28   $(SOPHYAINCP)ctimer.h \
    29   $(SOPHYAINCP)zthread.h dlftypes.h \
    30   basexecut.h $(SOPHYAINCP)strutilxx.h \
    31   pistdimgapp.h $(SOPHYAINCP)pisysdep.h \
     26  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)ctimer.h \
     27  $(SOPHYAINCP)zthread.h dlftypes.h basexecut.h \
     28  $(SOPHYAINCP)strutilxx.h pistdimgapp.h \
     29  $(SOPHYAINCP)pisysdep.h \
    3230  $(SOPHYAINCP)piapplx.h \
    3331  $(SOPHYAINCP)piapplgen.h \
    … …  
    3533  $(SOPHYAINCP)picontainerx.h \
    3634  $(SOPHYAINCP)picontainergen.h \
    37   $(SOPHYAINCP)piwdgx.h \
    38   $(SOPHYAINCP)piwdggen.h \
     35  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    3936  $(SOPHYAINCP)picolist.h \
    4037  $(SOPHYAINCP)pimenubarx.h \
    … …  
    4744  $(SOPHYAINCP)pibwdgx.h \
    4845  $(SOPHYAINCP)pibwdggen.h \
    49   $(SOPHYAINCP)picmap.h \
    50   $(SOPHYAINCP)picmapx.h \
     46  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    5147  $(SOPHYAINCP)picmapgen.h \
    5248  $(SOPHYAINCP)pigraphx.h \
    … …  
    6965  $(SOPHYAINCP)periodic.h \
    7066  $(SOPHYAINCP)piimage.h \
    71   $(SOPHYAINCP)parradapter.h \
    72   $(SOPHYAINCP)lut.h \
     67  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    7368  $(SOPHYAINCP)pieldrw.h \
    7469  $(SOPHYAINCP)pidrawer.h \
    75   $(SOPHYAINCP)pigratt.h \
    76   $(SOPHYAINCP)piaxes.h \
     70  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    7771  $(SOPHYAINCP)pipixmapx.h \
    7872  $(SOPHYAINCP)pipixmapgen.h \
    7973  $(SOPHYAINCP)picmapview.h \
    80   $(SOPHYAINCP)pi3dwdg.h \
    81   $(SOPHYAINCP)pi3ddrw.h \
    82   $(SOPHYAINCP)pigraph3d.h nobjmgr.h \
    83   pisiadw.h $(SOPHYAINCP)pilistx.h \
     74  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
     75  $(SOPHYAINCP)pigraph3d.h nobjmgr.h pisiadw.h \
     76  $(SOPHYAINCP)pilistx.h \
    8477  $(SOPHYAINCP)pilistgen.h \
    8578  $(SOPHYAINCP)pistzwin.h \
    8679  $(SOPHYAINCP)pitherm.h \
    87   $(SOPHYAINCP)resusage.h servnobjm.h \
    88   nomgadapter.h $(SOPHYAINCP)ntupintf.h \
     80  $(SOPHYAINCP)resusage.h servnobjm.h nomgadapter.h \
     81  $(SOPHYAINCP)ntupintf.h \
    8982  $(SOPHYAINCP)generalfit.h \
    90   $(SOPHYAINCP)tvector.h \
    91   $(SOPHYAINCP)tmatrix.h \
    92   $(SOPHYAINCP)tarray.h \
    93   $(SOPHYAINCP)basarr.h \
    94   $(SOPHYAINCP)ndatablock.h \
    95   $(SOPHYAINCP)utilarr.h \
    96   $(SOPHYAINCP)generaldata.h \
    97   $(SOPHYAINCP)poly.h \
    98   $(SOPHYAINCP)peida.h \
    99   $(SOPHYAINCP)utils.h \
    100   $(SOPHYAINCP)perrors.h \
    101   $(SOPHYAINCP)fmath.h \
    102   $(SOPHYAINCP)piyfxdrw.h \
    103   $(SOPHYAINCP)pibargraph.h \
    104   $(SOPHYAINCP)pitxtdrw.h \
    105   $(SOPHYAINCP)histos.h \
    106   $(SOPHYAINCP)histos2.h \
    107   $(SOPHYAINCP)hisprof.h \
     83  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     84  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     85  $(SOPHYAINCP)ndatablock.h \
     86  $(SOPHYAINCP)utilarr.h \
     87  $(SOPHYAINCP)generaldata.h \
     88  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     89  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     90  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)histos.h \
     91  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)hisprof.h \
    10892  $(SOPHYAINCP)ntuple.h
    10993        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  basexecut.cc
    11094 
    111 $(SOPHYAOBJP)contmodex.o: contmodex.cc \
    112   $(SOPHYAINCP)sopnamsp.h contmodex.h \
    113   $(SOPHYAINCP)machdefs.h piacmd.h \
     95$(SOPHYAOBJP)contmodex.o: contmodex.cc $(SOPHYAINCP)sopnamsp.h \
     96  contmodex.h $(SOPHYAINCP)machdefs.h \
     97  $(SOPHYAINCP)osx_values.h piacmd.h \
    11498  $(SOPHYAINCP)commander.h \
    115   $(SOPHYAINCP)pdlmgr.h \
    116   $(SOPHYAINCP)dvlist.h \
     99  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)dvlist.h \
    117100  $(SOPHYAINCP)objfio.h \
    118101  $(SOPHYAINCP)anydataobj.h \
    … …  
    123106  $(SOPHYAINCP)rawstream.h \
    124107  $(SOPHYAINCP)ppfnametag.h \
    125   $(SOPHYAINCP)mutyv.h \
    126   $(SOPHYAINCP)ctimer.h \
     108  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)ctimer.h \
    127109  $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h \
    128110  $(SOPHYAINCP)pigncont.h \
    … …  
    134116  $(SOPHYAINCP)picontainerx.h \
    135117  $(SOPHYAINCP)picontainergen.h \
    136   $(SOPHYAINCP)piwdgx.h \
    137   $(SOPHYAINCP)piwdggen.h \
     118  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    138119  $(SOPHYAINCP)picolist.h \
    139120  $(SOPHYAINCP)pimenubarx.h \
    … …  
    146127  $(SOPHYAINCP)pibwdgx.h \
    147128  $(SOPHYAINCP)pibwdggen.h \
    148   $(SOPHYAINCP)picmap.h \
    149   $(SOPHYAINCP)picmapx.h \
     129  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    150130  $(SOPHYAINCP)picmapgen.h \
    151131  $(SOPHYAINCP)pigraphx.h \
    … …  
    168148  $(SOPHYAINCP)periodic.h \
    169149  $(SOPHYAINCP)piimage.h \
    170   $(SOPHYAINCP)parradapter.h \
    171   $(SOPHYAINCP)lut.h \
     150  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    172151  $(SOPHYAINCP)pieldrw.h \
    173152  $(SOPHYAINCP)pidrawer.h \
    174   $(SOPHYAINCP)pigratt.h \
    175   $(SOPHYAINCP)piaxes.h \
     153  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    176154  $(SOPHYAINCP)pipixmapx.h \
    177155  $(SOPHYAINCP)pipixmapgen.h \
    178156  $(SOPHYAINCP)picmapview.h \
    179   $(SOPHYAINCP)pi3dwdg.h \
    180   $(SOPHYAINCP)pi3ddrw.h \
     157  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    181158  $(SOPHYAINCP)pigraph3d.h \
    182   $(SOPHYAINCP)nobjmgr.h \
    183   $(SOPHYAINCP)piacmd.h \
    184   $(SOPHYAINCP)pisiadw.h \
    185   $(SOPHYAINCP)pilistx.h \
     159  $(SOPHYAINCP)pisiadw.h $(SOPHYAINCP)pilistx.h \
    186160  $(SOPHYAINCP)pilistgen.h \
    187161  $(SOPHYAINCP)pistzwin.h \
    … …  
    189163  $(SOPHYAINCP)resusage.h \
    190164  $(SOPHYAINCP)piscdrawwdg.h \
    191   $(SOPHYAINCP)ntuple.h \
    192   $(SOPHYAINCP)ntupintf.h \
     165  $(SOPHYAINCP)ntuple.h $(SOPHYAINCP)ntupintf.h \
    193166  $(SOPHYAINCP)gp_contour.h \
    194167  $(SOPHYAINCP)gp_types.h \
    … …  
    198171  $(SOPHYAINCP)gp_alloc.h nomgadapter.h \
    199172  $(SOPHYAINCP)generalfit.h \
    200   $(SOPHYAINCP)tvector.h \
    201   $(SOPHYAINCP)tmatrix.h \
    202   $(SOPHYAINCP)tarray.h \
    203   $(SOPHYAINCP)basarr.h \
    204   $(SOPHYAINCP)ndatablock.h \
    205   $(SOPHYAINCP)utilarr.h \
    206   $(SOPHYAINCP)generaldata.h \
    207   $(SOPHYAINCP)poly.h \
    208   $(SOPHYAINCP)peida.h \
    209   $(SOPHYAINCP)utils.h \
    210   $(SOPHYAINCP)perrors.h \
     173  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     174  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     175  $(SOPHYAINCP)ndatablock.h \
     176  $(SOPHYAINCP)utilarr.h \
     177  $(SOPHYAINCP)generaldata.h \
     178  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     179  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    211180  $(SOPHYAINCP)fmath.h servnobjm.h
    212181        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  contmodex.cc
    213182 
    214 $(SOPHYAOBJP)cxxexecutor.o: cxxexecutor.cc \
    215   $(SOPHYAINCP)sopnamsp.h cxxexecutor.h \
    216   $(SOPHYAINCP)machdefs.h piacmd.h \
     183$(SOPHYAOBJP)cxxexecutor.o: cxxexecutor.cc $(SOPHYAINCP)sopnamsp.h \
     184  cxxexecutor.h $(SOPHYAINCP)machdefs.h \
     185  $(SOPHYAINCP)osx_values.h piacmd.h \
    217186  $(SOPHYAINCP)commander.h \
    218   $(SOPHYAINCP)pdlmgr.h \
    219   $(SOPHYAINCP)dvlist.h \
     187  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)dvlist.h \
    220188  $(SOPHYAINCP)objfio.h \
    221189  $(SOPHYAINCP)anydataobj.h \
    … …  
    226194  $(SOPHYAINCP)rawstream.h \
    227195  $(SOPHYAINCP)ppfnametag.h \
    228   $(SOPHYAINCP)mutyv.h \
    229   $(SOPHYAINCP)ctimer.h \
     196  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)ctimer.h \
    230197  $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h \
    231198  $(SOPHYAINCP)strutilxx.h \
    … …  
    233200  $(SOPHYAINCP)pidrawer.h \
    234201  $(SOPHYAINCP)pibwdggen.h \
    235   $(SOPHYAINCP)pisysdep.h \
    236   $(SOPHYAINCP)piwdgx.h \
     202  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    237203  $(SOPHYAINCP)piwdggen.h \
    238204  $(SOPHYAINCP)pimsghandler.h \
    239   $(SOPHYAINCP)picolist.h \
    240   $(SOPHYAINCP)picmap.h \
     205  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    241206  $(SOPHYAINCP)picmapx.h \
    242207  $(SOPHYAINCP)picmapgen.h \
    … …  
    249214  $(SOPHYAINCP)pigraphuc.h \
    250215  $(SOPHYAINCP)pievthandler.h \
    251   $(SOPHYAINCP)psfile.h \
    252   $(SOPHYAINCP)pigratt.h \
     216  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    253217  $(SOPHYAINCP)piaxes.h \
    254   $(SOPHYAINCP)parradapter.h \
    255   $(SOPHYAINCP)lut.h \
     218  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    256219  $(SOPHYAINCP)ntupintf.h \
    257220  $(SOPHYAINCP)generalfit.h \
    258   $(SOPHYAINCP)tvector.h \
    259   $(SOPHYAINCP)tmatrix.h \
    260   $(SOPHYAINCP)tarray.h \
    261   $(SOPHYAINCP)basarr.h \
    262   $(SOPHYAINCP)ndatablock.h \
    263   $(SOPHYAINCP)utilarr.h \
    264   $(SOPHYAINCP)generaldata.h \
    265   $(SOPHYAINCP)poly.h \
    266   $(SOPHYAINCP)peida.h \
    267   $(SOPHYAINCP)utils.h \
    268   $(SOPHYAINCP)perrors.h \
     221  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     222  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     223  $(SOPHYAINCP)ndatablock.h \
     224  $(SOPHYAINCP)utilarr.h \
     225  $(SOPHYAINCP)generaldata.h \
     226  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     227  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    269228  $(SOPHYAINCP)fmath.h pistdimgapp.h \
    270229  $(SOPHYAINCP)piapplx.h \
    … …  
    289248  $(SOPHYAINCP)piperiodx.h \
    290249  $(SOPHYAINCP)periodic.h \
    291   $(SOPHYAINCP)piimage.h \
    292   $(SOPHYAINCP)pieldrw.h \
     250  $(SOPHYAINCP)piimage.h $(SOPHYAINCP)pieldrw.h \
    293251  $(SOPHYAINCP)pipixmapx.h \
    294252  $(SOPHYAINCP)pipixmapgen.h \
    295253  $(SOPHYAINCP)picmapview.h \
    296   $(SOPHYAINCP)pi3dwdg.h \
    297   $(SOPHYAINCP)pi3ddrw.h \
     254  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    298255  $(SOPHYAINCP)pigraph3d.h pisiadw.h \
    299256  $(SOPHYAINCP)pilistx.h \
    … …  
    304261        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  cxxexecutor.cc
    305262 
    306 $(SOPHYAOBJP)cxxexecwin.o: cxxexecwin.cc \
    307   $(SOPHYAINCP)sopnamsp.h cxxexecutor.h \
    308   $(SOPHYAINCP)machdefs.h piacmd.h \
     263$(SOPHYAOBJP)cxxexecwin.o: cxxexecwin.cc $(SOPHYAINCP)sopnamsp.h \
     264  cxxexecutor.h $(SOPHYAINCP)machdefs.h \
     265  $(SOPHYAINCP)osx_values.h piacmd.h \
    309266  $(SOPHYAINCP)commander.h \
    310   $(SOPHYAINCP)pdlmgr.h \
    311   $(SOPHYAINCP)dvlist.h \
     267  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)dvlist.h \
    312268  $(SOPHYAINCP)objfio.h \
    313269  $(SOPHYAINCP)anydataobj.h \
    … …  
    318274  $(SOPHYAINCP)rawstream.h \
    319275  $(SOPHYAINCP)ppfnametag.h \
    320   $(SOPHYAINCP)mutyv.h \
    321   $(SOPHYAINCP)ctimer.h \
    322   $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h \
    323   cxxexecwin.h $(SOPHYAINCP)pisysdep.h \
    324   pistdimgapp.h $(SOPHYAINCP)piapplx.h \
     276  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)ctimer.h \
     277  $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h cxxexecwin.h \
     278  $(SOPHYAINCP)pisysdep.h pistdimgapp.h \
     279  $(SOPHYAINCP)piapplx.h \
    325280  $(SOPHYAINCP)piapplgen.h \
    326281  $(SOPHYAINCP)pimsghandler.h \
    327282  $(SOPHYAINCP)picontainerx.h \
    328283  $(SOPHYAINCP)picontainergen.h \
    329   $(SOPHYAINCP)piwdgx.h \
    330   $(SOPHYAINCP)piwdggen.h \
     284  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    331285  $(SOPHYAINCP)picolist.h \
    332286  $(SOPHYAINCP)pimenubarx.h \
    … …  
    339293  $(SOPHYAINCP)pibwdgx.h \
    340294  $(SOPHYAINCP)pibwdggen.h \
    341   $(SOPHYAINCP)picmap.h \
    342   $(SOPHYAINCP)picmapx.h \
     295  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    343296  $(SOPHYAINCP)picmapgen.h \
    344297  $(SOPHYAINCP)pigraphx.h \
    … …  
    361314  $(SOPHYAINCP)periodic.h \
    362315  $(SOPHYAINCP)piimage.h \
    363   $(SOPHYAINCP)parradapter.h \
    364   $(SOPHYAINCP)lut.h \
     316  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    365317  $(SOPHYAINCP)pieldrw.h \
    366318  $(SOPHYAINCP)pidrawer.h \
    367   $(SOPHYAINCP)pigratt.h \
    368   $(SOPHYAINCP)piaxes.h \
     319  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    369320  $(SOPHYAINCP)pipixmapx.h \
    370321  $(SOPHYAINCP)pipixmapgen.h \
    371322  $(SOPHYAINCP)picmapview.h \
    372   $(SOPHYAINCP)pi3dwdg.h \
    373   $(SOPHYAINCP)pi3ddrw.h \
     323  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    374324  $(SOPHYAINCP)pigraph3d.h pisiadw.h \
    375325  $(SOPHYAINCP)pilistx.h \
    … …  
    380330        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  cxxexecwin.cc
    381331 
    382 $(SOPHYAOBJP)flowmodex.o: flowmodex.cc \
    383   $(SOPHYAINCP)sopnamsp.h flowmodex.h \
    384   $(SOPHYAINCP)machdefs.h piacmd.h \
     332$(SOPHYAOBJP)flowmodex.o: flowmodex.cc $(SOPHYAINCP)sopnamsp.h \
     333  flowmodex.h $(SOPHYAINCP)machdefs.h \
     334  $(SOPHYAINCP)osx_values.h piacmd.h \
    385335  $(SOPHYAINCP)commander.h \
    386   $(SOPHYAINCP)pdlmgr.h \
    387   $(SOPHYAINCP)dvlist.h \
     336  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)dvlist.h \
    388337  $(SOPHYAINCP)objfio.h \
    389338  $(SOPHYAINCP)anydataobj.h \
    … …  
    394343  $(SOPHYAINCP)rawstream.h \
    395344  $(SOPHYAINCP)ppfnametag.h \
    396   $(SOPHYAINCP)mutyv.h \
    397   $(SOPHYAINCP)ctimer.h \
    398   $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h \
    399   pi2dvec.h pistdimgapp.h \
    400   $(SOPHYAINCP)pisysdep.h \
     345  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)ctimer.h \
     346  $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h pi2dvec.h \
     347  pistdimgapp.h $(SOPHYAINCP)pisysdep.h \
    401348  $(SOPHYAINCP)piapplx.h \
    402349  $(SOPHYAINCP)piapplgen.h \
    … …  
    404351  $(SOPHYAINCP)picontainerx.h \
    405352  $(SOPHYAINCP)picontainergen.h \
    406   $(SOPHYAINCP)piwdgx.h \
    407   $(SOPHYAINCP)piwdggen.h \
     353  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    408354  $(SOPHYAINCP)picolist.h \
    409355  $(SOPHYAINCP)pimenubarx.h \
    … …  
    416362  $(SOPHYAINCP)pibwdgx.h \
    417363  $(SOPHYAINCP)pibwdggen.h \
    418   $(SOPHYAINCP)picmap.h \
    419   $(SOPHYAINCP)picmapx.h \
     364  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    420365  $(SOPHYAINCP)picmapgen.h \
    421366  $(SOPHYAINCP)pigraphx.h \
    … …  
    438383  $(SOPHYAINCP)periodic.h \
    439384  $(SOPHYAINCP)piimage.h \
    440   $(SOPHYAINCP)parradapter.h \
    441   $(SOPHYAINCP)lut.h \
     385  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    442386  $(SOPHYAINCP)pieldrw.h \
    443387  $(SOPHYAINCP)pidrawer.h \
    444   $(SOPHYAINCP)pigratt.h \
    445   $(SOPHYAINCP)piaxes.h \
     388  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    446389  $(SOPHYAINCP)pipixmapx.h \
    447390  $(SOPHYAINCP)pipixmapgen.h \
    448391  $(SOPHYAINCP)picmapview.h \
    449   $(SOPHYAINCP)pi3dwdg.h \
    450   $(SOPHYAINCP)pi3ddrw.h \
     392  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    451393  $(SOPHYAINCP)pigraph3d.h pisiadw.h \
    452394  $(SOPHYAINCP)pilistx.h \
    … …  
    456398  $(SOPHYAINCP)resusage.h \
    457399  $(SOPHYAINCP)piscdrawwdg.h \
    458   $(SOPHYAINCP)ntupintf.h \
    459   $(SOPHYAINCP)ntuple.h nomgadapter.h \
    460   $(SOPHYAINCP)generalfit.h \
    461   $(SOPHYAINCP)tvector.h \
    462   $(SOPHYAINCP)tmatrix.h \
    463   $(SOPHYAINCP)tarray.h \
    464   $(SOPHYAINCP)basarr.h \
    465   $(SOPHYAINCP)ndatablock.h \
    466   $(SOPHYAINCP)utilarr.h \
    467   $(SOPHYAINCP)generaldata.h \
    468   $(SOPHYAINCP)poly.h \
    469   $(SOPHYAINCP)peida.h \
    470   $(SOPHYAINCP)utils.h \
    471   $(SOPHYAINCP)perrors.h \
     400  $(SOPHYAINCP)ntupintf.h $(SOPHYAINCP)ntuple.h \
     401  nomgadapter.h $(SOPHYAINCP)generalfit.h \
     402  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     403  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     404  $(SOPHYAINCP)ndatablock.h \
     405  $(SOPHYAINCP)utilarr.h \
     406  $(SOPHYAINCP)generaldata.h \
     407  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     408  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    472409  $(SOPHYAINCP)fmath.h servnobjm.h
    473410        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  flowmodex.cc
     411 
     412$(SOPHYAOBJP)graphexecut.o: graphexecut.cc $(SOPHYAINCP)sopnamsp.h \
     413  piacmd.h $(SOPHYAINCP)machdefs.h \
     414  $(SOPHYAINCP)osx_values.h \
     415  $(SOPHYAINCP)commander.h \
     416  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)dvlist.h \
     417  $(SOPHYAINCP)objfio.h \
     418  $(SOPHYAINCP)anydataobj.h \
     419  $(SOPHYAINCP)ppersist.h \
     420  $(SOPHYAINCP)pexceptions.h \
     421  $(SOPHYAINCP)gnumd5.h \
     422  $(SOPHYAINCP)ppfbinstream.h \
     423  $(SOPHYAINCP)rawstream.h \
     424  $(SOPHYAINCP)ppfnametag.h \
     425  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)ctimer.h \
     426  $(SOPHYAINCP)zthread.h dlftypes.h graphexecut.h \
     427  $(SOPHYAINCP)strutilxx.h pistdimgapp.h \
     428  $(SOPHYAINCP)pisysdep.h \
     429  $(SOPHYAINCP)piapplx.h \
     430  $(SOPHYAINCP)piapplgen.h \
     431  $(SOPHYAINCP)pimsghandler.h \
     432  $(SOPHYAINCP)picontainerx.h \
     433  $(SOPHYAINCP)picontainergen.h \
     434  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
     435  $(SOPHYAINCP)picolist.h \
     436  $(SOPHYAINCP)pimenubarx.h \
     437  $(SOPHYAINCP)pimenubargen.h \
     438  $(SOPHYAINCP)pimenux.h \
     439  $(SOPHYAINCP)pimenugen.h \
     440  $(SOPHYAINCP)picons.h \
     441  $(SOPHYAINCP)pistdwdgx.h \
     442  $(SOPHYAINCP)pistdwdggen.h \
     443  $(SOPHYAINCP)pibwdgx.h \
     444  $(SOPHYAINCP)pibwdggen.h \
     445  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
     446  $(SOPHYAINCP)picmapgen.h \
     447  $(SOPHYAINCP)pigraphx.h \
     448  $(SOPHYAINCP)pigraphgen.h \
     449  $(SOPHYAINCP)pifontx.h \
     450  $(SOPHYAINCP)pifontgen.h \
     451  $(SOPHYAINCP)pigrcoord.h \
     452  $(SOPHYAINCP)pilineatt.h \
     453  $(SOPHYAINCP)pigraphuc.h \
     454  $(SOPHYAINCP)pievthandler.h \
     455  $(SOPHYAINCP)psfile.h \
     456  $(SOPHYAINCP)pigraphps.h \
     457  $(SOPHYAINCP)piwindowx.h \
     458  $(SOPHYAINCP)piwindowgen.h \
     459  $(SOPHYAINCP)pioptmenux.h \
     460  $(SOPHYAINCP)pioptmenugen.h \
     461  $(SOPHYAINCP)pifilechox.h \
     462  $(SOPHYAINCP)pifilechogen.h \
     463  $(SOPHYAINCP)piperiodx.h \
     464  $(SOPHYAINCP)periodic.h \
     465  $(SOPHYAINCP)piimage.h \
     466  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
     467  $(SOPHYAINCP)pieldrw.h \
     468  $(SOPHYAINCP)pidrawer.h \
     469  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
     470  $(SOPHYAINCP)pipixmapx.h \
     471  $(SOPHYAINCP)pipixmapgen.h \
     472  $(SOPHYAINCP)picmapview.h \
     473  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
     474  $(SOPHYAINCP)pigraph3d.h nobjmgr.h pisiadw.h \
     475  $(SOPHYAINCP)pilistx.h \
     476  $(SOPHYAINCP)pilistgen.h \
     477  $(SOPHYAINCP)pistzwin.h \
     478  $(SOPHYAINCP)pitherm.h \
     479  $(SOPHYAINCP)resusage.h nomgadapter.h \
     480  $(SOPHYAINCP)ntupintf.h \
     481  $(SOPHYAINCP)generalfit.h \
     482  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     483  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     484  $(SOPHYAINCP)ndatablock.h \
     485  $(SOPHYAINCP)utilarr.h \
     486  $(SOPHYAINCP)generaldata.h \
     487  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     488  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     489  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)piyfxdrw.h \
     490  $(SOPHYAINCP)pibargraph.h \
     491  $(SOPHYAINCP)pitxtdrw.h
     492        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  graphexecut.cc
    474493 
    475494$(SOPHYAOBJP)nobjmgr.o: nobjmgr.cc $(SOPHYAINCP)sopnamsp.h \
    476495  $(SOPHYAINCP)strutil.h \
    477496  $(SOPHYAINCP)datatypes.h \
    478   $(SOPHYAINCP)machdefs.h nobjmgr.h \
     497  $(SOPHYAINCP)machdefs.h \
     498  $(SOPHYAINCP)osx_values.h nobjmgr.h \
    479499  $(SOPHYAINCP)anydataobj.h \
    480500  $(SOPHYAINCP)ppersist.h \
    … …  
    484504  $(SOPHYAINCP)rawstream.h \
    485505  $(SOPHYAINCP)ppfnametag.h \
    486   $(SOPHYAINCP)dvlist.h \
    487   $(SOPHYAINCP)objfio.h \
     506  $(SOPHYAINCP)dvlist.h $(SOPHYAINCP)objfio.h \
    488507  $(SOPHYAINCP)mutyv.h dlftypes.h servnobjm.h \
    489   $(SOPHYAINCP)pdlmgr.h \
    490   $(SOPHYAINCP)zthread.h nomgadapter.h \
    491   $(SOPHYAINCP)pidrawer.h \
    492   $(SOPHYAINCP)pibwdggen.h \
    493   $(SOPHYAINCP)pisysdep.h \
    494   $(SOPHYAINCP)piwdgx.h \
     508  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)zthread.h \
     509  nomgadapter.h $(SOPHYAINCP)pidrawer.h \
     510  $(SOPHYAINCP)pibwdggen.h \
     511  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    495512  $(SOPHYAINCP)piwdggen.h \
    496513  $(SOPHYAINCP)pimsghandler.h \
    497   $(SOPHYAINCP)picolist.h \
    498   $(SOPHYAINCP)picmap.h \
     514  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    499515  $(SOPHYAINCP)picmapx.h \
    500516  $(SOPHYAINCP)picmapgen.h \
    … …  
    507523  $(SOPHYAINCP)pigraphuc.h \
    508524  $(SOPHYAINCP)pievthandler.h \
    509   $(SOPHYAINCP)psfile.h \
    510   $(SOPHYAINCP)pigratt.h \
     525  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    511526  $(SOPHYAINCP)piaxes.h \
    512   $(SOPHYAINCP)parradapter.h \
    513   $(SOPHYAINCP)lut.h \
     527  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    514528  $(SOPHYAINCP)ntupintf.h \
    515529  $(SOPHYAINCP)generalfit.h \
    516   $(SOPHYAINCP)tvector.h \
    517   $(SOPHYAINCP)tmatrix.h \
    518   $(SOPHYAINCP)tarray.h \
    519   $(SOPHYAINCP)basarr.h \
    520   $(SOPHYAINCP)ndatablock.h \
    521   $(SOPHYAINCP)utilarr.h \
    522   $(SOPHYAINCP)generaldata.h \
    523   $(SOPHYAINCP)poly.h \
    524   $(SOPHYAINCP)peida.h \
    525   $(SOPHYAINCP)utils.h \
    526   $(SOPHYAINCP)perrors.h \
     530  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     531  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     532  $(SOPHYAINCP)ndatablock.h \
     533  $(SOPHYAINCP)utilarr.h \
     534  $(SOPHYAINCP)generaldata.h \
     535  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     536  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    527537  $(SOPHYAINCP)fmath.h pistdimgapp.h \
    528538  $(SOPHYAINCP)piapplx.h \
    … …  
    547557  $(SOPHYAINCP)piperiodx.h \
    548558  $(SOPHYAINCP)periodic.h \
    549   $(SOPHYAINCP)piimage.h \
    550   $(SOPHYAINCP)pieldrw.h \
     559  $(SOPHYAINCP)piimage.h $(SOPHYAINCP)pieldrw.h \
    551560  $(SOPHYAINCP)pipixmapx.h \
    552561  $(SOPHYAINCP)pipixmapgen.h \
    553562  $(SOPHYAINCP)picmapview.h \
    554   $(SOPHYAINCP)pi3dwdg.h \
    555   $(SOPHYAINCP)pi3ddrw.h \
     563  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    556564  $(SOPHYAINCP)pigraph3d.h piacmd.h \
    557565  $(SOPHYAINCP)commander.h \
    … …  
    587595  $(SOPHYAINCP)piyfxdrw.h \
    588596  $(SOPHYAINCP)pisurfdr.h pipodrw.h \
    589   $(SOPHYAINCP)histos2.h \
    590   $(SOPHYAINCP)histos.h pintuple.h pintup3d.h \
    591   pigfd1.h pigfd2.h
     597  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)histos.h \
     598  pintuple.h pintup3d.h pigfd1.h pigfd2.h
    592599        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  nobjmgr.cc
    593600 
    594 $(SOPHYAOBJP)nomgadapter.o: nomgadapter.cc \
    595   $(SOPHYAINCP)sopnamsp.h \
    596   $(SOPHYAINCP)machdefs.h nomgadapter.h \
     601$(SOPHYAOBJP)nomgadapter.o: nomgadapter.cc $(SOPHYAINCP)sopnamsp.h \
     602  $(SOPHYAINCP)machdefs.h \
     603  $(SOPHYAINCP)osx_values.h nomgadapter.h \
    597604  $(SOPHYAINCP)ppersist.h \
    598605  $(SOPHYAINCP)pexceptions.h \
    … …  
    604611  $(SOPHYAINCP)pidrawer.h \
    605612  $(SOPHYAINCP)pibwdggen.h \
    606   $(SOPHYAINCP)pisysdep.h \
    607   $(SOPHYAINCP)piwdgx.h \
     613  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    608614  $(SOPHYAINCP)piwdggen.h \
    609615  $(SOPHYAINCP)pimsghandler.h \
    610   $(SOPHYAINCP)picolist.h \
    611   $(SOPHYAINCP)picmap.h \
     616  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    612617  $(SOPHYAINCP)picmapx.h \
    613618  $(SOPHYAINCP)picmapgen.h \
    … …  
    620625  $(SOPHYAINCP)pigraphuc.h \
    621626  $(SOPHYAINCP)pievthandler.h \
    622   $(SOPHYAINCP)psfile.h \
    623   $(SOPHYAINCP)pigratt.h \
     627  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    624628  $(SOPHYAINCP)piaxes.h \
    625   $(SOPHYAINCP)parradapter.h \
    626   $(SOPHYAINCP)lut.h \
     629  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    627630  $(SOPHYAINCP)ntupintf.h \
    628631  $(SOPHYAINCP)generalfit.h \
    629   $(SOPHYAINCP)tvector.h \
    630   $(SOPHYAINCP)tmatrix.h \
    631   $(SOPHYAINCP)tarray.h \
    632   $(SOPHYAINCP)basarr.h \
    633   $(SOPHYAINCP)mutyv.h \
    634   $(SOPHYAINCP)dvlist.h \
     632  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     633  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     634  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
    635635  $(SOPHYAINCP)objfio.h \
    636636  $(SOPHYAINCP)ndatablock.h \
    637637  $(SOPHYAINCP)utilarr.h \
    638638  $(SOPHYAINCP)generaldata.h \
    639   $(SOPHYAINCP)poly.h \
    640   $(SOPHYAINCP)peida.h \
    641   $(SOPHYAINCP)utils.h \
    642   $(SOPHYAINCP)perrors.h \
     639  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     640  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    643641  $(SOPHYAINCP)fmath.h
    644642        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  nomgadapter.cc
    645643 
    646 $(SOPHYAOBJP)nomgfdadapter.o: nomgfdadapter.cc \
    647   $(SOPHYAINCP)sopnamsp.h \
    648   $(SOPHYAINCP)machdefs.h nomgfdadapter.h \
    649   nomgadapter.h $(SOPHYAINCP)ppersist.h \
    650   $(SOPHYAINCP)pexceptions.h \
    651   $(SOPHYAINCP)gnumd5.h \
    652   $(SOPHYAINCP)ppfbinstream.h \
    653   $(SOPHYAINCP)rawstream.h \
    654   $(SOPHYAINCP)ppfnametag.h \
    655   $(SOPHYAINCP)anydataobj.h \
    656   $(SOPHYAINCP)pidrawer.h \
    657   $(SOPHYAINCP)pibwdggen.h \
    658   $(SOPHYAINCP)pisysdep.h \
    659   $(SOPHYAINCP)piwdgx.h \
     644$(SOPHYAOBJP)nomgfdadapter.o: nomgfdadapter.cc $(SOPHYAINCP)sopnamsp.h \
     645  $(SOPHYAINCP)machdefs.h \
     646  $(SOPHYAINCP)osx_values.h nomgfdadapter.h nomgadapter.h \
     647  $(SOPHYAINCP)ppersist.h \
     648  $(SOPHYAINCP)pexceptions.h \
     649  $(SOPHYAINCP)gnumd5.h \
     650  $(SOPHYAINCP)ppfbinstream.h \
     651  $(SOPHYAINCP)rawstream.h \
     652  $(SOPHYAINCP)ppfnametag.h \
     653  $(SOPHYAINCP)anydataobj.h \
     654  $(SOPHYAINCP)pidrawer.h \
     655  $(SOPHYAINCP)pibwdggen.h \
     656  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    660657  $(SOPHYAINCP)piwdggen.h \
    661658  $(SOPHYAINCP)pimsghandler.h \
    662   $(SOPHYAINCP)picolist.h \
    663   $(SOPHYAINCP)picmap.h \
     659  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    664660  $(SOPHYAINCP)picmapx.h \
    665661  $(SOPHYAINCP)picmapgen.h \
    … …  
    672668  $(SOPHYAINCP)pigraphuc.h \
    673669  $(SOPHYAINCP)pievthandler.h \
    674   $(SOPHYAINCP)psfile.h \
    675   $(SOPHYAINCP)pigratt.h \
     670  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    676671  $(SOPHYAINCP)piaxes.h \
    677   $(SOPHYAINCP)parradapter.h \
    678   $(SOPHYAINCP)lut.h \
     672  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    679673  $(SOPHYAINCP)ntupintf.h \
    680674  $(SOPHYAINCP)generalfit.h \
    681   $(SOPHYAINCP)tvector.h \
    682   $(SOPHYAINCP)tmatrix.h \
    683   $(SOPHYAINCP)tarray.h \
    684   $(SOPHYAINCP)basarr.h \
    685   $(SOPHYAINCP)mutyv.h \
    686   $(SOPHYAINCP)dvlist.h \
     675  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     676  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     677  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
    687678  $(SOPHYAINCP)objfio.h \
    688679  $(SOPHYAINCP)ndatablock.h \
    689680  $(SOPHYAINCP)utilarr.h \
    690681  $(SOPHYAINCP)generaldata.h \
    691   $(SOPHYAINCP)poly.h \
    692   $(SOPHYAINCP)peida.h \
    693   $(SOPHYAINCP)utils.h \
    694   $(SOPHYAINCP)perrors.h \
     682  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     683  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    695684  $(SOPHYAINCP)fmath.h pipodrw.h \
    696   $(SOPHYAINCP)histos2.h \
    697   $(SOPHYAINCP)histos.h \
     685  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)histos.h \
    698686  $(SOPHYAINCP)objfitter.h \
    699   $(SOPHYAINCP)cimage.h \
    700   $(SOPHYAINCP)fioarr.h \
     687  $(SOPHYAINCP)cimage.h $(SOPHYAINCP)fioarr.h \
    701688  $(SOPHYAINCP)hisprof.h
    702689        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  nomgfdadapter.cc
    703690 
    704 $(SOPHYAOBJP)nomhistadapter.o: nomhistadapter.cc \
    705   $(SOPHYAINCP)sopnamsp.h \
    706   $(SOPHYAINCP)machdefs.h nomhistadapter.h \
    707   nomgadapter.h $(SOPHYAINCP)ppersist.h \
    708   $(SOPHYAINCP)pexceptions.h \
    709   $(SOPHYAINCP)gnumd5.h \
    710   $(SOPHYAINCP)ppfbinstream.h \
    711   $(SOPHYAINCP)rawstream.h \
    712   $(SOPHYAINCP)ppfnametag.h \
    713   $(SOPHYAINCP)anydataobj.h \
    714   $(SOPHYAINCP)pidrawer.h \
    715   $(SOPHYAINCP)pibwdggen.h \
    716   $(SOPHYAINCP)pisysdep.h \
    717   $(SOPHYAINCP)piwdgx.h \
     691$(SOPHYAOBJP)nomhistadapter.o: nomhistadapter.cc $(SOPHYAINCP)sopnamsp.h \
     692  $(SOPHYAINCP)machdefs.h \
     693  $(SOPHYAINCP)osx_values.h nomhistadapter.h nomgadapter.h \
     694  $(SOPHYAINCP)ppersist.h \
     695  $(SOPHYAINCP)pexceptions.h \
     696  $(SOPHYAINCP)gnumd5.h \
     697  $(SOPHYAINCP)ppfbinstream.h \
     698  $(SOPHYAINCP)rawstream.h \
     699  $(SOPHYAINCP)ppfnametag.h \
     700  $(SOPHYAINCP)anydataobj.h \
     701  $(SOPHYAINCP)pidrawer.h \
     702  $(SOPHYAINCP)pibwdggen.h \
     703  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    718704  $(SOPHYAINCP)piwdggen.h \
    719705  $(SOPHYAINCP)pimsghandler.h \
    720   $(SOPHYAINCP)picolist.h \
    721   $(SOPHYAINCP)picmap.h \
     706  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    722707  $(SOPHYAINCP)picmapx.h \
    723708  $(SOPHYAINCP)picmapgen.h \
    … …  
    730715  $(SOPHYAINCP)pigraphuc.h \
    731716  $(SOPHYAINCP)pievthandler.h \
    732   $(SOPHYAINCP)psfile.h \
    733   $(SOPHYAINCP)pigratt.h \
     717  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    734718  $(SOPHYAINCP)piaxes.h \
    735   $(SOPHYAINCP)parradapter.h \
    736   $(SOPHYAINCP)lut.h \
     719  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    737720  $(SOPHYAINCP)ntupintf.h \
    738721  $(SOPHYAINCP)generalfit.h \
    739   $(SOPHYAINCP)tvector.h \
    740   $(SOPHYAINCP)tmatrix.h \
    741   $(SOPHYAINCP)tarray.h \
    742   $(SOPHYAINCP)basarr.h \
    743   $(SOPHYAINCP)mutyv.h \
    744   $(SOPHYAINCP)dvlist.h \
     722  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     723  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     724  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
    745725  $(SOPHYAINCP)objfio.h \
    746726  $(SOPHYAINCP)ndatablock.h \
    747727  $(SOPHYAINCP)utilarr.h \
    748728  $(SOPHYAINCP)generaldata.h \
    749   $(SOPHYAINCP)poly.h \
    750   $(SOPHYAINCP)peida.h \
    751   $(SOPHYAINCP)utils.h \
    752   $(SOPHYAINCP)perrors.h \
    753   $(SOPHYAINCP)fmath.h \
    754   $(SOPHYAINCP)histos.h \
    755   $(SOPHYAINCP)histos2.h \
    756   $(SOPHYAINCP)hisprof.h \
    757   $(SOPHYAINCP)histerr.h \
    758   $(SOPHYAINCP)ntuple.h \
     729  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     730  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     731  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)histos.h \
     732  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)hisprof.h \
     733  $(SOPHYAINCP)histerr.h $(SOPHYAINCP)ntuple.h \
    759734  $(SOPHYAINCP)xntuple.h \
    760735  $(SOPHYAINCP)basedtable.h \
    761   $(SOPHYAINCP)segdatablock.h pihisto.h \
    762   pihisto2d.h $(SOPHYAINCP)pimenux.h \
     736  $(SOPHYAINCP)segdatablock.h pihisto.h pihisto2d.h \
     737  $(SOPHYAINCP)pimenux.h \
    763738  $(SOPHYAINCP)pimenugen.h \
    764739  $(SOPHYAINCP)pimenubarx.h \
    … …  
    775750  $(SOPHYAINCP)picontainerx.h \
    776751  $(SOPHYAINCP)picontainergen.h \
    777   $(SOPHYAINCP)pieldrw.h pipodrw.h \
    778   servnobjm.h nobjmgr.h dlftypes.h \
    779   $(SOPHYAINCP)pdlmgr.h \
     752  $(SOPHYAINCP)pieldrw.h pipodrw.h servnobjm.h nobjmgr.h \
     753  dlftypes.h $(SOPHYAINCP)pdlmgr.h \
    780754  $(SOPHYAINCP)zthread.h \
    781755  $(SOPHYAINCP)objfitter.h \
    782   $(SOPHYAINCP)cimage.h \
    783   $(SOPHYAINCP)fioarr.h \
     756  $(SOPHYAINCP)cimage.h $(SOPHYAINCP)fioarr.h \
    784757  $(SOPHYAINCP)fitsntuple.h \
    785758  $(SOPHYAINCP)fitsfile.h \
    … …  
    794767        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  nomhistadapter.cc
    795768 
    796 $(SOPHYAOBJP)nomimagadapter.o: nomimagadapter.cc \
    797   $(SOPHYAINCP)sopnamsp.h \
    798   $(SOPHYAINCP)machdefs.h \
    799   $(SOPHYAINCP)datatype.h nomimagadapter.h \
    800   nomgadapter.h $(SOPHYAINCP)ppersist.h \
    801   $(SOPHYAINCP)pexceptions.h \
    802   $(SOPHYAINCP)gnumd5.h \
    803   $(SOPHYAINCP)ppfbinstream.h \
    804   $(SOPHYAINCP)rawstream.h \
    805   $(SOPHYAINCP)ppfnametag.h \
    806   $(SOPHYAINCP)anydataobj.h \
    807   $(SOPHYAINCP)pidrawer.h \
    808   $(SOPHYAINCP)pibwdggen.h \
    809   $(SOPHYAINCP)pisysdep.h \
    810   $(SOPHYAINCP)piwdgx.h \
     769$(SOPHYAOBJP)nomimagadapter.o: nomimagadapter.cc $(SOPHYAINCP)sopnamsp.h \
     770  $(SOPHYAINCP)machdefs.h \
     771  $(SOPHYAINCP)osx_values.h \
     772  $(SOPHYAINCP)datatype.h nomimagadapter.h nomgadapter.h \
     773  $(SOPHYAINCP)ppersist.h \
     774  $(SOPHYAINCP)pexceptions.h \
     775  $(SOPHYAINCP)gnumd5.h \
     776  $(SOPHYAINCP)ppfbinstream.h \
     777  $(SOPHYAINCP)rawstream.h \
     778  $(SOPHYAINCP)ppfnametag.h \
     779  $(SOPHYAINCP)anydataobj.h \
     780  $(SOPHYAINCP)pidrawer.h \
     781  $(SOPHYAINCP)pibwdggen.h \
     782  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    811783  $(SOPHYAINCP)piwdggen.h \
    812784  $(SOPHYAINCP)pimsghandler.h \
    813   $(SOPHYAINCP)picolist.h \
    814   $(SOPHYAINCP)picmap.h \
     785  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    815786  $(SOPHYAINCP)picmapx.h \
    816787  $(SOPHYAINCP)picmapgen.h \
    … …  
    823794  $(SOPHYAINCP)pigraphuc.h \
    824795  $(SOPHYAINCP)pievthandler.h \
    825   $(SOPHYAINCP)psfile.h \
    826   $(SOPHYAINCP)pigratt.h \
     796  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    827797  $(SOPHYAINCP)piaxes.h \
    828   $(SOPHYAINCP)parradapter.h \
    829   $(SOPHYAINCP)lut.h \
     798  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    830799  $(SOPHYAINCP)ntupintf.h \
    831800  $(SOPHYAINCP)generalfit.h \
    832   $(SOPHYAINCP)tvector.h \
    833   $(SOPHYAINCP)tmatrix.h \
    834   $(SOPHYAINCP)tarray.h \
    835   $(SOPHYAINCP)basarr.h \
    836   $(SOPHYAINCP)mutyv.h \
    837   $(SOPHYAINCP)dvlist.h \
     801  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     802  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     803  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
    838804  $(SOPHYAINCP)objfio.h \
    839805  $(SOPHYAINCP)ndatablock.h \
    840806  $(SOPHYAINCP)utilarr.h \
    841807  $(SOPHYAINCP)generaldata.h \
    842   $(SOPHYAINCP)poly.h \
    843   $(SOPHYAINCP)peida.h \
    844   $(SOPHYAINCP)utils.h \
    845   $(SOPHYAINCP)perrors.h \
    846   $(SOPHYAINCP)fmath.h \
    847   $(SOPHYAINCP)cimage.h \
     808  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     809  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     810  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)cimage.h \
    848811  $(SOPHYAINCP)fioarr.h pimgadapter.h \
    849812  $(SOPHYAINCP)objfitter.h \
    850   $(SOPHYAINCP)histos.h \
    851   $(SOPHYAINCP)histos2.h \
     813  $(SOPHYAINCP)histos.h $(SOPHYAINCP)histos2.h \
    852814  $(SOPHYAINCP)hisprof.h \
    853815  $(SOPHYAINCP)fitstarray.h \
    … …  
    860822  $(SOPHYAINCP)sopnamsp.h \
    861823  $(SOPHYAINCP)machdefs.h \
    862   $(SOPHYAINCP)datatype.h nomskymapadapter.h \
    863   nomgadapter.h $(SOPHYAINCP)ppersist.h \
    864   $(SOPHYAINCP)pexceptions.h \
    865   $(SOPHYAINCP)gnumd5.h \
    866   $(SOPHYAINCP)ppfbinstream.h \
    867   $(SOPHYAINCP)rawstream.h \
    868   $(SOPHYAINCP)ppfnametag.h \
    869   $(SOPHYAINCP)anydataobj.h \
    870   $(SOPHYAINCP)pidrawer.h \
    871   $(SOPHYAINCP)pibwdggen.h \
    872   $(SOPHYAINCP)pisysdep.h \
    873   $(SOPHYAINCP)piwdgx.h \
     824  $(SOPHYAINCP)osx_values.h \
     825  $(SOPHYAINCP)datatype.h nomskymapadapter.h nomgadapter.h \
     826  $(SOPHYAINCP)ppersist.h \
     827  $(SOPHYAINCP)pexceptions.h \
     828  $(SOPHYAINCP)gnumd5.h \
     829  $(SOPHYAINCP)ppfbinstream.h \
     830  $(SOPHYAINCP)rawstream.h \
     831  $(SOPHYAINCP)ppfnametag.h \
     832  $(SOPHYAINCP)anydataobj.h \
     833  $(SOPHYAINCP)pidrawer.h \
     834  $(SOPHYAINCP)pibwdggen.h \
     835  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    874836  $(SOPHYAINCP)piwdggen.h \
    875837  $(SOPHYAINCP)pimsghandler.h \
    876   $(SOPHYAINCP)picolist.h \
    877   $(SOPHYAINCP)picmap.h \
     838  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    878839  $(SOPHYAINCP)picmapx.h \
    879840  $(SOPHYAINCP)picmapgen.h \
    … …  
    886847  $(SOPHYAINCP)pigraphuc.h \
    887848  $(SOPHYAINCP)pievthandler.h \
    888   $(SOPHYAINCP)psfile.h \
    889   $(SOPHYAINCP)pigratt.h \
     849  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    890850  $(SOPHYAINCP)piaxes.h \
    891   $(SOPHYAINCP)parradapter.h \
    892   $(SOPHYAINCP)lut.h \
     851  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    893852  $(SOPHYAINCP)ntupintf.h \
    894853  $(SOPHYAINCP)generalfit.h \
    895   $(SOPHYAINCP)tvector.h \
    896   $(SOPHYAINCP)tmatrix.h \
    897   $(SOPHYAINCP)tarray.h \
    898   $(SOPHYAINCP)basarr.h \
    899   $(SOPHYAINCP)mutyv.h \
    900   $(SOPHYAINCP)dvlist.h \
     854  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     855  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     856  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
    901857  $(SOPHYAINCP)objfio.h \
    902858  $(SOPHYAINCP)ndatablock.h \
    903859  $(SOPHYAINCP)utilarr.h \
    904860  $(SOPHYAINCP)generaldata.h \
    905   $(SOPHYAINCP)poly.h \
    906   $(SOPHYAINCP)peida.h \
    907   $(SOPHYAINCP)utils.h \
    908   $(SOPHYAINCP)perrors.h \
    909   $(SOPHYAINCP)fmath.h \
    910   $(SOPHYAINCP)pixelmap.h \
     861  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     862  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     863  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)pixelmap.h \
    911864  $(SOPHYAINCP)spherepos.h \
    912865  $(SOPHYAINCP)unitvector.h \
    913866  $(SOPHYAINCP)vector3d.h \
    914867  $(SOPHYAINCP)longlat.h \
    915   $(SOPHYAINCP)utilgeom.h \
    916   $(SOPHYAINCP)skymap.h \
     868  $(SOPHYAINCP)utilgeom.h $(SOPHYAINCP)skymap.h \
    917869  $(SOPHYAINCP)spherethetaphi.h \
    918870  $(SOPHYAINCP)sphericalmap.h \
    … …  
    937889  $(SOPHYAINCP)sopnamsp.h \
    938890  $(SOPHYAINCP)machdefs.h \
    939   nomspecrespadapter.h nomgadapter.h \
    940   $(SOPHYAINCP)ppersist.h \
    941   $(SOPHYAINCP)pexceptions.h \
    942   $(SOPHYAINCP)gnumd5.h \
    943   $(SOPHYAINCP)ppfbinstream.h \
    944   $(SOPHYAINCP)rawstream.h \
    945   $(SOPHYAINCP)ppfnametag.h \
    946   $(SOPHYAINCP)anydataobj.h \
    947   $(SOPHYAINCP)pidrawer.h \
    948   $(SOPHYAINCP)pibwdggen.h \
    949   $(SOPHYAINCP)pisysdep.h \
    950   $(SOPHYAINCP)piwdgx.h \
     891  $(SOPHYAINCP)osx_values.h nomspecrespadapter.h \
     892  nomgadapter.h $(SOPHYAINCP)ppersist.h \
     893  $(SOPHYAINCP)pexceptions.h \
     894  $(SOPHYAINCP)gnumd5.h \
     895  $(SOPHYAINCP)ppfbinstream.h \
     896  $(SOPHYAINCP)rawstream.h \
     897  $(SOPHYAINCP)ppfnametag.h \
     898  $(SOPHYAINCP)anydataobj.h \
     899  $(SOPHYAINCP)pidrawer.h \
     900  $(SOPHYAINCP)pibwdggen.h \
     901  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    951902  $(SOPHYAINCP)piwdggen.h \
    952903  $(SOPHYAINCP)pimsghandler.h \
    953   $(SOPHYAINCP)picolist.h \
    954   $(SOPHYAINCP)picmap.h \
     904  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    955905  $(SOPHYAINCP)picmapx.h \
    956906  $(SOPHYAINCP)picmapgen.h \
    … …  
    963913  $(SOPHYAINCP)pigraphuc.h \
    964914  $(SOPHYAINCP)pievthandler.h \
    965   $(SOPHYAINCP)psfile.h \
    966   $(SOPHYAINCP)pigratt.h \
     915  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    967916  $(SOPHYAINCP)piaxes.h \
    968   $(SOPHYAINCP)parradapter.h \
    969   $(SOPHYAINCP)lut.h \
     917  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    970918  $(SOPHYAINCP)ntupintf.h \
    971919  $(SOPHYAINCP)generalfit.h \
    972   $(SOPHYAINCP)tvector.h \
    973   $(SOPHYAINCP)tmatrix.h \
    974   $(SOPHYAINCP)tarray.h \
    975   $(SOPHYAINCP)basarr.h \
    976   $(SOPHYAINCP)mutyv.h \
    977   $(SOPHYAINCP)dvlist.h \
     920  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     921  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     922  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
    978923  $(SOPHYAINCP)objfio.h \
    979924  $(SOPHYAINCP)ndatablock.h \
    980925  $(SOPHYAINCP)utilarr.h \
    981926  $(SOPHYAINCP)generaldata.h \
    982   $(SOPHYAINCP)poly.h \
    983   $(SOPHYAINCP)peida.h \
    984   $(SOPHYAINCP)utils.h \
    985   $(SOPHYAINCP)perrors.h \
    986   $(SOPHYAINCP)fmath.h \
    987   $(SOPHYAINCP)specresp.h \
     927  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     928  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     929  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)specresp.h \
    988930  $(SOPHYAINCP)specrespvector.h \
    989931  $(SOPHYAINCP)gaussfilt.h
    990932        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  nomspecrespadapter.cc
    991933 
    992 $(SOPHYAOBJP)nomtarradapter.o: nomtarradapter.cc \
    993   $(SOPHYAINCP)sopnamsp.h \
    994   $(SOPHYAINCP)machdefs.h \
    995   $(SOPHYAINCP)datatype.h nomtarradapter.h \
    996   nomgadapter.h $(SOPHYAINCP)ppersist.h \
    997   $(SOPHYAINCP)pexceptions.h \
    998   $(SOPHYAINCP)gnumd5.h \
    999   $(SOPHYAINCP)ppfbinstream.h \
    1000   $(SOPHYAINCP)rawstream.h \
    1001   $(SOPHYAINCP)ppfnametag.h \
    1002   $(SOPHYAINCP)anydataobj.h \
    1003   $(SOPHYAINCP)pidrawer.h \
    1004   $(SOPHYAINCP)pibwdggen.h \
    1005   $(SOPHYAINCP)pisysdep.h \
    1006   $(SOPHYAINCP)piwdgx.h \
     934$(SOPHYAOBJP)nomtarradapter.o: nomtarradapter.cc $(SOPHYAINCP)sopnamsp.h \
     935  $(SOPHYAINCP)machdefs.h \
     936  $(SOPHYAINCP)osx_values.h \
     937  $(SOPHYAINCP)datatype.h nomtarradapter.h nomgadapter.h \
     938  $(SOPHYAINCP)ppersist.h \
     939  $(SOPHYAINCP)pexceptions.h \
     940  $(SOPHYAINCP)gnumd5.h \
     941  $(SOPHYAINCP)ppfbinstream.h \
     942  $(SOPHYAINCP)rawstream.h \
     943  $(SOPHYAINCP)ppfnametag.h \
     944  $(SOPHYAINCP)anydataobj.h \
     945  $(SOPHYAINCP)pidrawer.h \
     946  $(SOPHYAINCP)pibwdggen.h \
     947  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    1007948  $(SOPHYAINCP)piwdggen.h \
    1008949  $(SOPHYAINCP)pimsghandler.h \
    1009   $(SOPHYAINCP)picolist.h \
    1010   $(SOPHYAINCP)picmap.h \
     950  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    1011951  $(SOPHYAINCP)picmapx.h \
    1012952  $(SOPHYAINCP)picmapgen.h \
    … …  
    1019959  $(SOPHYAINCP)pigraphuc.h \
    1020960  $(SOPHYAINCP)pievthandler.h \
    1021   $(SOPHYAINCP)psfile.h \
    1022   $(SOPHYAINCP)pigratt.h \
     961  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    1023962  $(SOPHYAINCP)piaxes.h \
    1024   $(SOPHYAINCP)parradapter.h \
    1025   $(SOPHYAINCP)lut.h \
     963  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    1026964  $(SOPHYAINCP)ntupintf.h \
    1027965  $(SOPHYAINCP)generalfit.h \
    1028   $(SOPHYAINCP)tvector.h \
    1029   $(SOPHYAINCP)tmatrix.h \
    1030   $(SOPHYAINCP)tarray.h \
    1031   $(SOPHYAINCP)basarr.h \
    1032   $(SOPHYAINCP)mutyv.h \
    1033   $(SOPHYAINCP)dvlist.h \
     966  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     967  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     968  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
    1034969  $(SOPHYAINCP)objfio.h \
    1035970  $(SOPHYAINCP)ndatablock.h \
    1036971  $(SOPHYAINCP)utilarr.h \
    1037972  $(SOPHYAINCP)generaldata.h \
    1038   $(SOPHYAINCP)poly.h \
    1039   $(SOPHYAINCP)peida.h \
    1040   $(SOPHYAINCP)utils.h \
    1041   $(SOPHYAINCP)perrors.h \
     973  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     974  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    1042975  $(SOPHYAINCP)fmath.h pitvmaad.h \
    1043   $(SOPHYAINCP)piyfxdrw.h \
    1044   $(SOPHYAINCP)fioarr.h \
     976  $(SOPHYAINCP)piyfxdrw.h $(SOPHYAINCP)fioarr.h \
    1045977  $(SOPHYAINCP)fitstarray.h \
    1046978  $(SOPHYAINCP)fitsfile.h \
    … …  
    1052984  $(SOPHYAINCP)sopnamsp.h \
    1053985  $(SOPHYAINCP)machdefs.h \
     986  $(SOPHYAINCP)osx_values.h \
    1054987  $(SOPHYAINCP)datatype.h \
    1055   $(SOPHYAINCP)tvector.h \
    1056   $(SOPHYAINCP)tmatrix.h \
    1057   $(SOPHYAINCP)tarray.h \
    1058   $(SOPHYAINCP)basarr.h \
    1059   $(SOPHYAINCP)anydataobj.h \
    1060   $(SOPHYAINCP)mutyv.h \
    1061   $(SOPHYAINCP)dvlist.h \
    1062   $(SOPHYAINCP)objfio.h \
    1063   $(SOPHYAINCP)ppersist.h \
     988  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     989  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     990  $(SOPHYAINCP)anydataobj.h \
     991  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     992  $(SOPHYAINCP)objfio.h $(SOPHYAINCP)ppersist.h \
    1064993  $(SOPHYAINCP)pexceptions.h \
    1065994  $(SOPHYAINCP)gnumd5.h \
    … …  
    1070999  $(SOPHYAINCP)utilarr.h \
    10711000  $(SOPHYAINCP)objfitter.h \
    1072   $(SOPHYAINCP)cimage.h \
    1073   $(SOPHYAINCP)fioarr.h \
    1074   $(SOPHYAINCP)histos.h \
    1075   $(SOPHYAINCP)peida.h \
    1076   $(SOPHYAINCP)utils.h \
    1077   $(SOPHYAINCP)perrors.h \
    1078   $(SOPHYAINCP)fmath.h \
    1079   $(SOPHYAINCP)histos2.h \
     1001  $(SOPHYAINCP)cimage.h $(SOPHYAINCP)fioarr.h \
     1002  $(SOPHYAINCP)histos.h $(SOPHYAINCP)peida.h \
     1003  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     1004  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)histos2.h \
    10801005  $(SOPHYAINCP)hisprof.h \
    10811006  $(SOPHYAINCP)generalfit.h \
    10821007  $(SOPHYAINCP)generaldata.h \
    1083   $(SOPHYAINCP)ntupintf.h \
    1084   $(SOPHYAINCP)poly.h nomtmatvecadapter.h \
    1085   nomgadapter.h $(SOPHYAINCP)pidrawer.h \
    1086   $(SOPHYAINCP)pibwdggen.h \
    1087   $(SOPHYAINCP)pisysdep.h \
    1088   $(SOPHYAINCP)piwdgx.h \
     1008  $(SOPHYAINCP)ntupintf.h $(SOPHYAINCP)poly.h \
     1009  nomtmatvecadapter.h nomgadapter.h $(SOPHYAINCP)pidrawer.h \
     1010  $(SOPHYAINCP)pibwdggen.h \
     1011  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    10891012  $(SOPHYAINCP)piwdggen.h \
    10901013  $(SOPHYAINCP)pimsghandler.h \
    1091   $(SOPHYAINCP)picolist.h \
    1092   $(SOPHYAINCP)picmap.h \
     1014  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    10931015  $(SOPHYAINCP)picmapx.h \
    10941016  $(SOPHYAINCP)picmapgen.h \
    … …  
    11011023  $(SOPHYAINCP)pigraphuc.h \
    11021024  $(SOPHYAINCP)pievthandler.h \
    1103   $(SOPHYAINCP)psfile.h \
    1104   $(SOPHYAINCP)pigratt.h \
     1025  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    11051026  $(SOPHYAINCP)piaxes.h \
    1106   $(SOPHYAINCP)parradapter.h \
    1107   $(SOPHYAINCP)lut.h \
     1027  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    11081028  $(SOPHYAINCP)piyfxdrw.h pitvmaad.h \
    11091029  $(SOPHYAINCP)fitstarray.h \
    … …  
    11131033        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  nomtmatvecadapter.cc
    11141034 
    1115 $(SOPHYAOBJP)pawexecut.o: pawexecut.cc \
    1116   $(SOPHYAINCP)sopnamsp.h \
     1035$(SOPHYAOBJP)pawexecut.o: pawexecut.cc $(SOPHYAINCP)sopnamsp.h \
    11171036  $(SOPHYAINCP)strutil.h \
    11181037  $(SOPHYAINCP)strutilxx.h \
    11191038  $(SOPHYAINCP)machdefs.h \
    1120   $(SOPHYAINCP)histos.h \
    1121   $(SOPHYAINCP)objfio.h \
     1039  $(SOPHYAINCP)osx_values.h \
     1040  $(SOPHYAINCP)histos.h $(SOPHYAINCP)objfio.h \
    11221041  $(SOPHYAINCP)anydataobj.h \
    11231042  $(SOPHYAINCP)ppersist.h \
    … …  
    11271046  $(SOPHYAINCP)rawstream.h \
    11281047  $(SOPHYAINCP)ppfnametag.h \
    1129   $(SOPHYAINCP)peida.h \
    1130   $(SOPHYAINCP)utils.h \
    1131   $(SOPHYAINCP)perrors.h \
    1132   $(SOPHYAINCP)fmath.h \
    1133   $(SOPHYAINCP)tvector.h \
    1134   $(SOPHYAINCP)tmatrix.h \
    1135   $(SOPHYAINCP)tarray.h \
    1136   $(SOPHYAINCP)basarr.h \
    1137   $(SOPHYAINCP)mutyv.h \
    1138   $(SOPHYAINCP)dvlist.h \
    1139   $(SOPHYAINCP)ndatablock.h \
    1140   $(SOPHYAINCP)utilarr.h \
    1141   $(SOPHYAINCP)histos2.h \
    1142   $(SOPHYAINCP)hisprof.h \
    1143   $(SOPHYAINCP)histerr.h \
    1144   $(SOPHYAINCP)ntuple.h \
    1145   $(SOPHYAINCP)ntupintf.h pawexecut.h \
    1146   piacmd.h $(SOPHYAINCP)commander.h \
    1147   $(SOPHYAINCP)pdlmgr.h \
    1148   $(SOPHYAINCP)ctimer.h \
    1149   $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h \
    1150   servnobjm.h nomgadapter.h \
    1151   $(SOPHYAINCP)pidrawer.h \
    1152   $(SOPHYAINCP)pibwdggen.h \
    1153   $(SOPHYAINCP)pisysdep.h \
    1154   $(SOPHYAINCP)piwdgx.h \
     1048  $(SOPHYAINCP)peida.h $(SOPHYAINCP)utils.h \
     1049  $(SOPHYAINCP)perrors.h $(SOPHYAINCP)fmath.h \
     1050  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1051  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1052  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1053  $(SOPHYAINCP)ndatablock.h \
     1054  $(SOPHYAINCP)utilarr.h $(SOPHYAINCP)histos2.h \
     1055  $(SOPHYAINCP)hisprof.h $(SOPHYAINCP)histerr.h \
     1056  $(SOPHYAINCP)ntuple.h $(SOPHYAINCP)ntupintf.h \
     1057  pawexecut.h piacmd.h $(SOPHYAINCP)commander.h \
     1058  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)ctimer.h \
     1059  $(SOPHYAINCP)zthread.h dlftypes.h nobjmgr.h servnobjm.h \
     1060  nomgadapter.h $(SOPHYAINCP)pidrawer.h \
     1061  $(SOPHYAINCP)pibwdggen.h \
     1062  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    11551063  $(SOPHYAINCP)piwdggen.h \
    11561064  $(SOPHYAINCP)pimsghandler.h \
    1157   $(SOPHYAINCP)picolist.h \
    1158   $(SOPHYAINCP)picmap.h \
     1065  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    11591066  $(SOPHYAINCP)picmapx.h \
    11601067  $(SOPHYAINCP)picmapgen.h \
    … …  
    11671074  $(SOPHYAINCP)pigraphuc.h \
    11681075  $(SOPHYAINCP)pievthandler.h \
    1169   $(SOPHYAINCP)psfile.h \
    1170   $(SOPHYAINCP)pigratt.h \
     1076  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    11711077  $(SOPHYAINCP)piaxes.h \
    1172   $(SOPHYAINCP)parradapter.h \
    1173   $(SOPHYAINCP)lut.h \
     1078  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    11741079  $(SOPHYAINCP)generalfit.h \
    11751080  $(SOPHYAINCP)generaldata.h \
    … …  
    11961101  $(SOPHYAINCP)piperiodx.h \
    11971102  $(SOPHYAINCP)periodic.h \
    1198   $(SOPHYAINCP)piimage.h \
    1199   $(SOPHYAINCP)pieldrw.h \
     1103  $(SOPHYAINCP)piimage.h $(SOPHYAINCP)pieldrw.h \
    12001104  $(SOPHYAINCP)pipixmapx.h \
    12011105  $(SOPHYAINCP)pipixmapgen.h \
    12021106  $(SOPHYAINCP)picmapview.h \
    1203   $(SOPHYAINCP)pi3dwdg.h \
    1204   $(SOPHYAINCP)pi3ddrw.h \
     1107  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    12051108  $(SOPHYAINCP)pigraph3d.h pisiadw.h \
    12061109  $(SOPHYAINCP)pilistx.h \
    … …  
    12131116$(SOPHYAOBJP)pi2dvec.o: pi2dvec.cc $(SOPHYAINCP)sopnamsp.h \
    12141117  $(SOPHYAINCP)machdefs.h \
    1215   $(SOPHYAINCP)histos.h \
    1216   $(SOPHYAINCP)objfio.h \
     1118  $(SOPHYAINCP)osx_values.h \
     1119  $(SOPHYAINCP)histos.h $(SOPHYAINCP)objfio.h \
    12171120  $(SOPHYAINCP)anydataobj.h \
    12181121  $(SOPHYAINCP)ppersist.h \
    … …  
    12221125  $(SOPHYAINCP)rawstream.h \
    12231126  $(SOPHYAINCP)ppfnametag.h \
    1224   $(SOPHYAINCP)peida.h \
    1225   $(SOPHYAINCP)utils.h \
    1226   $(SOPHYAINCP)perrors.h \
    1227   $(SOPHYAINCP)fmath.h \
    1228   $(SOPHYAINCP)tvector.h \
    1229   $(SOPHYAINCP)tmatrix.h \
    1230   $(SOPHYAINCP)tarray.h \
    1231   $(SOPHYAINCP)basarr.h \
    1232   $(SOPHYAINCP)mutyv.h \
    1233   $(SOPHYAINCP)dvlist.h \
    1234   $(SOPHYAINCP)ndatablock.h \
    1235   $(SOPHYAINCP)utilarr.h \
    1236   $(SOPHYAINCP)ntuple.h \
    1237   $(SOPHYAINCP)ntupintf.h \
    1238   $(SOPHYAINCP)nbtri.h pi2dvec.h \
    1239   pistdimgapp.h $(SOPHYAINCP)pisysdep.h \
     1127  $(SOPHYAINCP)peida.h $(SOPHYAINCP)utils.h \
     1128  $(SOPHYAINCP)perrors.h $(SOPHYAINCP)fmath.h \
     1129  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1130  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1131  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1132  $(SOPHYAINCP)ndatablock.h \
     1133  $(SOPHYAINCP)utilarr.h $(SOPHYAINCP)ntuple.h \
     1134  $(SOPHYAINCP)ntupintf.h $(SOPHYAINCP)nbtri.h \
     1135  pi2dvec.h pistdimgapp.h $(SOPHYAINCP)pisysdep.h \
    12401136  $(SOPHYAINCP)piapplx.h \
    12411137  $(SOPHYAINCP)piapplgen.h \
    … …  
    12431139  $(SOPHYAINCP)picontainerx.h \
    12441140  $(SOPHYAINCP)picontainergen.h \
    1245   $(SOPHYAINCP)piwdgx.h \
    1246   $(SOPHYAINCP)piwdggen.h \
     1141  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    12471142  $(SOPHYAINCP)picolist.h \
    12481143  $(SOPHYAINCP)pimenubarx.h \
    … …  
    12551150  $(SOPHYAINCP)pibwdgx.h \
    12561151  $(SOPHYAINCP)pibwdggen.h \
    1257   $(SOPHYAINCP)picmap.h \
    1258   $(SOPHYAINCP)picmapx.h \
     1152  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    12591153  $(SOPHYAINCP)picmapgen.h \
    12601154  $(SOPHYAINCP)pigraphx.h \
    … …  
    12771171  $(SOPHYAINCP)periodic.h \
    12781172  $(SOPHYAINCP)piimage.h \
    1279   $(SOPHYAINCP)parradapter.h \
    1280   $(SOPHYAINCP)lut.h \
     1173  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    12811174  $(SOPHYAINCP)pieldrw.h \
    12821175  $(SOPHYAINCP)pidrawer.h \
    1283   $(SOPHYAINCP)pigratt.h \
    1284   $(SOPHYAINCP)piaxes.h \
     1176  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    12851177  $(SOPHYAINCP)pipixmapx.h \
    12861178  $(SOPHYAINCP)pipixmapgen.h \
    12871179  $(SOPHYAINCP)picmapview.h \
    1288   $(SOPHYAINCP)pi3dwdg.h \
    1289   $(SOPHYAINCP)pi3ddrw.h \
    1290   $(SOPHYAINCP)pigraph3d.h nobjmgr.h \
    1291   dlftypes.h piacmd.h \
     1180  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
     1181  $(SOPHYAINCP)pigraph3d.h nobjmgr.h dlftypes.h piacmd.h \
    12921182  $(SOPHYAINCP)commander.h \
    1293   $(SOPHYAINCP)pdlmgr.h \
    1294   $(SOPHYAINCP)ctimer.h \
     1183  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)ctimer.h \
    12951184  $(SOPHYAINCP)zthread.h pisiadw.h \
    12961185  $(SOPHYAINCP)pilistx.h \
    … …  
    13021191        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pi2dvec.cc
    13031192 
    1304 $(SOPHYAOBJP)piacmd.o: piacmd.cc $(SOPHYAINCP)sopnamsp.h \
    1305   piacmd.h $(SOPHYAINCP)machdefs.h \
     1193$(SOPHYAOBJP)piacmd.o: piacmd.cc $(SOPHYAINCP)sopnamsp.h piacmd.h \
     1194  $(SOPHYAINCP)machdefs.h \
     1195  $(SOPHYAINCP)osx_values.h \
    13061196  $(SOPHYAINCP)commander.h \
    1307   $(SOPHYAINCP)pdlmgr.h \
    1308   $(SOPHYAINCP)dvlist.h \
     1197  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)dvlist.h \
    13091198  $(SOPHYAINCP)objfio.h \
    13101199  $(SOPHYAINCP)anydataobj.h \
    … …  
    13151204  $(SOPHYAINCP)rawstream.h \
    13161205  $(SOPHYAINCP)ppfnametag.h \
    1317   $(SOPHYAINCP)mutyv.h \
    1318   $(SOPHYAINCP)ctimer.h \
     1206  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)ctimer.h \
    13191207  $(SOPHYAINCP)zthread.h dlftypes.h \
    1320   basexecut.h $(SOPHYAINCP)strutil.h \
     1208  $(SOPHYAINCP)strutil.h \
    13211209  $(SOPHYAINCP)strutilxx.h \
    13221210  $(SOPHYAINCP)srandgen.h pistdimgapp.h \
    … …  
    13271215  $(SOPHYAINCP)picontainerx.h \
    13281216  $(SOPHYAINCP)picontainergen.h \
    1329   $(SOPHYAINCP)piwdgx.h \
    1330   $(SOPHYAINCP)piwdggen.h \
     1217  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    13311218  $(SOPHYAINCP)picolist.h \
    13321219  $(SOPHYAINCP)pimenubarx.h \
    … …  
    13391226  $(SOPHYAINCP)pibwdgx.h \
    13401227  $(SOPHYAINCP)pibwdggen.h \
    1341   $(SOPHYAINCP)picmap.h \
    1342   $(SOPHYAINCP)picmapx.h \
     1228  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    13431229  $(SOPHYAINCP)picmapgen.h \
    13441230  $(SOPHYAINCP)pigraphx.h \
    … …  
    13611247  $(SOPHYAINCP)periodic.h \
    13621248  $(SOPHYAINCP)piimage.h \
    1363   $(SOPHYAINCP)parradapter.h \
    1364   $(SOPHYAINCP)lut.h \
     1249  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    13651250  $(SOPHYAINCP)pieldrw.h \
    13661251  $(SOPHYAINCP)pidrawer.h \
    1367   $(SOPHYAINCP)pigratt.h \
    1368   $(SOPHYAINCP)piaxes.h \
     1252  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    13691253  $(SOPHYAINCP)pipixmapx.h \
    13701254  $(SOPHYAINCP)pipixmapgen.h \
    13711255  $(SOPHYAINCP)picmapview.h \
    1372   $(SOPHYAINCP)pi3dwdg.h \
    1373   $(SOPHYAINCP)pi3ddrw.h \
    1374   $(SOPHYAINCP)pigraph3d.h nobjmgr.h \
    1375   pisiadw.h $(SOPHYAINCP)pilistx.h \
     1256  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
     1257  $(SOPHYAINCP)pigraph3d.h nobjmgr.h pisiadw.h \
     1258  $(SOPHYAINCP)pilistx.h \
    13761259  $(SOPHYAINCP)pilistgen.h \
    13771260  $(SOPHYAINCP)pistzwin.h \
    13781261  $(SOPHYAINCP)pitherm.h \
    1379   $(SOPHYAINCP)resusage.h piafitting.h \
    1380   nomgadapter.h $(SOPHYAINCP)ntupintf.h \
     1262  $(SOPHYAINCP)resusage.h basexecut.h graphexecut.h \
     1263  piafitting.h nomgadapter.h $(SOPHYAINCP)ntupintf.h \
    13811264  $(SOPHYAINCP)generalfit.h \
    1382   $(SOPHYAINCP)tvector.h \
    1383   $(SOPHYAINCP)tmatrix.h \
    1384   $(SOPHYAINCP)tarray.h \
    1385   $(SOPHYAINCP)basarr.h \
    1386   $(SOPHYAINCP)ndatablock.h \
    1387   $(SOPHYAINCP)utilarr.h \
    1388   $(SOPHYAINCP)generaldata.h \
    1389   $(SOPHYAINCP)poly.h \
    1390   $(SOPHYAINCP)peida.h \
    1391   $(SOPHYAINCP)utils.h \
    1392   $(SOPHYAINCP)perrors.h \
    1393   $(SOPHYAINCP)fmath.h pawexecut.h \
    1394   cxxexecutor.h cxxexecwin.h contmodex.h flowmodex.h
     1265  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1266  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1267  $(SOPHYAINCP)ndatablock.h \
     1268  $(SOPHYAINCP)utilarr.h \
     1269  $(SOPHYAINCP)generaldata.h \
     1270  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     1271  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     1272  $(SOPHYAINCP)fmath.h pawexecut.h cxxexecutor.h \
     1273  cxxexecwin.h contmodex.h flowmodex.h
    13951274        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piacmd.cc
    13961275 
    1397 $(SOPHYAOBJP)piafitting.o: piafitting.cc \
    1398   $(SOPHYAINCP)sopnamsp.h \
    1399   $(SOPHYAINCP)strutil.h \
    1400   $(SOPHYAINCP)nbtri.h \
    1401   $(SOPHYAINCP)machdefs.h \
     1276$(SOPHYAOBJP)piafitting.o: piafitting.cc $(SOPHYAINCP)sopnamsp.h \
     1277  $(SOPHYAINCP)strutil.h $(SOPHYAINCP)nbtri.h \
     1278  $(SOPHYAINCP)machdefs.h \
     1279  $(SOPHYAINCP)osx_values.h \
    14021280  $(SOPHYAINCP)generalfit.h \
    14031281  $(SOPHYAINCP)pexceptions.h \
    1404   $(SOPHYAINCP)tvector.h \
    1405   $(SOPHYAINCP)tmatrix.h \
    1406   $(SOPHYAINCP)tarray.h \
    1407   $(SOPHYAINCP)basarr.h \
    1408   $(SOPHYAINCP)anydataobj.h \
    1409   $(SOPHYAINCP)mutyv.h \
    1410   $(SOPHYAINCP)dvlist.h \
    1411   $(SOPHYAINCP)objfio.h \
    1412   $(SOPHYAINCP)ppersist.h \
    1413   $(SOPHYAINCP)gnumd5.h \
    1414   $(SOPHYAINCP)ppfbinstream.h \
    1415   $(SOPHYAINCP)rawstream.h \
    1416   $(SOPHYAINCP)ppfnametag.h \
    1417   $(SOPHYAINCP)ndatablock.h \
    1418   $(SOPHYAINCP)utilarr.h \
    1419   $(SOPHYAINCP)generaldata.h \
    1420   $(SOPHYAINCP)ntupintf.h \
    1421   $(SOPHYAINCP)poly.h \
    1422   $(SOPHYAINCP)peida.h \
    1423   $(SOPHYAINCP)utils.h \
    1424   $(SOPHYAINCP)perrors.h \
    1425   $(SOPHYAINCP)fmath.h \
     1282  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1283  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1284  $(SOPHYAINCP)anydataobj.h \
     1285  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1286  $(SOPHYAINCP)objfio.h $(SOPHYAINCP)ppersist.h \
     1287  $(SOPHYAINCP)gnumd5.h \
     1288  $(SOPHYAINCP)ppfbinstream.h \
     1289  $(SOPHYAINCP)rawstream.h \
     1290  $(SOPHYAINCP)ppfnametag.h \
     1291  $(SOPHYAINCP)ndatablock.h \
     1292  $(SOPHYAINCP)utilarr.h \
     1293  $(SOPHYAINCP)generaldata.h \
     1294  $(SOPHYAINCP)ntupintf.h $(SOPHYAINCP)poly.h \
     1295  $(SOPHYAINCP)peida.h $(SOPHYAINCP)utils.h \
     1296  $(SOPHYAINCP)perrors.h $(SOPHYAINCP)fmath.h \
    14261297  $(SOPHYAINCP)fct1dfit.h \
    1427   $(SOPHYAINCP)fct2dfit.h \
    1428   $(SOPHYAINCP)ntuple.h \
    1429   $(SOPHYAINCP)cimage.h \
    1430   $(SOPHYAINCP)fioarr.h \
    1431   $(SOPHYAINCP)histos.h \
    1432   $(SOPHYAINCP)histos2.h \
     1298  $(SOPHYAINCP)fct2dfit.h $(SOPHYAINCP)ntuple.h \
     1299  $(SOPHYAINCP)cimage.h $(SOPHYAINCP)fioarr.h \
     1300  $(SOPHYAINCP)histos.h $(SOPHYAINCP)histos2.h \
    14331301  $(SOPHYAINCP)hisprof.h \
    1434   $(SOPHYAINCP)objfitter.h piafitting.h \
    1435   nomgadapter.h $(SOPHYAINCP)pidrawer.h \
    1436   $(SOPHYAINCP)pibwdggen.h \
    1437   $(SOPHYAINCP)pisysdep.h \
    1438   $(SOPHYAINCP)piwdgx.h \
     1302  $(SOPHYAINCP)objfitter.h piafitting.h nomgadapter.h \
     1303  $(SOPHYAINCP)pidrawer.h \
     1304  $(SOPHYAINCP)pibwdggen.h \
     1305  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    14391306  $(SOPHYAINCP)piwdggen.h \
    14401307  $(SOPHYAINCP)pimsghandler.h \
    1441   $(SOPHYAINCP)picolist.h \
    1442   $(SOPHYAINCP)picmap.h \
     1308  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    14431309  $(SOPHYAINCP)picmapx.h \
    14441310  $(SOPHYAINCP)picmapgen.h \
    … …  
    14511317  $(SOPHYAINCP)pigraphuc.h \
    14521318  $(SOPHYAINCP)pievthandler.h \
    1453   $(SOPHYAINCP)psfile.h \
    1454   $(SOPHYAINCP)pigratt.h \
     1319  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    14551320  $(SOPHYAINCP)piaxes.h \
    1456   $(SOPHYAINCP)parradapter.h \
    1457   $(SOPHYAINCP)lut.h \
     1321  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    14581322  $(SOPHYAINCP)pdlmgr.h dlftypes.h piacmd.h \
    14591323  $(SOPHYAINCP)commander.h \
    1460   $(SOPHYAINCP)ctimer.h \
    1461   $(SOPHYAINCP)zthread.h nobjmgr.h \
    1462   pistdimgapp.h $(SOPHYAINCP)piapplx.h \
     1324  $(SOPHYAINCP)ctimer.h $(SOPHYAINCP)zthread.h \
     1325  nobjmgr.h pistdimgapp.h $(SOPHYAINCP)piapplx.h \
    14631326  $(SOPHYAINCP)piapplgen.h \
    14641327  $(SOPHYAINCP)picontainerx.h \
    … …  
    14811344  $(SOPHYAINCP)piperiodx.h \
    14821345  $(SOPHYAINCP)periodic.h \
    1483   $(SOPHYAINCP)piimage.h \
    1484   $(SOPHYAINCP)pieldrw.h \
     1346  $(SOPHYAINCP)piimage.h $(SOPHYAINCP)pieldrw.h \
    14851347  $(SOPHYAINCP)pipixmapx.h \
    14861348  $(SOPHYAINCP)pipixmapgen.h \
    14871349  $(SOPHYAINCP)picmapview.h \
    1488   $(SOPHYAINCP)pi3dwdg.h \
    1489   $(SOPHYAINCP)pi3ddrw.h \
     1350  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    14901351  $(SOPHYAINCP)pigraph3d.h pisiadw.h \
    14911352  $(SOPHYAINCP)pilistx.h \
    … …  
    14941355  $(SOPHYAINCP)pitherm.h \
    14951356  $(SOPHYAINCP)resusage.h nomhistadapter.h \
    1496   $(SOPHYAINCP)histerr.h \
    1497   $(SOPHYAINCP)xntuple.h \
     1357  $(SOPHYAINCP)histerr.h $(SOPHYAINCP)xntuple.h \
    14981358  $(SOPHYAINCP)basedtable.h \
    14991359  $(SOPHYAINCP)segdatablock.h nomgfdadapter.h \
    … …  
    15011361        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piafitting.cc
    15021362 
    1503 $(SOPHYAOBJP)pigfd1.o: pigfd1.cc $(SOPHYAINCP)sopnamsp.h \
    1504   pigfd1.h $(SOPHYAINCP)generaldata.h \
    1505   $(SOPHYAINCP)objfio.h \
    1506   $(SOPHYAINCP)machdefs.h \
     1363$(SOPHYAOBJP)pigfd1.o: pigfd1.cc $(SOPHYAINCP)sopnamsp.h pigfd1.h \
     1364  $(SOPHYAINCP)generaldata.h \
     1365  $(SOPHYAINCP)objfio.h $(SOPHYAINCP)machdefs.h \
     1366  $(SOPHYAINCP)osx_values.h \
    15071367  $(SOPHYAINCP)anydataobj.h \
    15081368  $(SOPHYAINCP)ppersist.h \
    … …  
    15121372  $(SOPHYAINCP)rawstream.h \
    15131373  $(SOPHYAINCP)ppfnametag.h \
    1514   $(SOPHYAINCP)ntupintf.h \
    1515   $(SOPHYAINCP)poly.h \
    1516   $(SOPHYAINCP)peida.h \
    1517   $(SOPHYAINCP)utils.h \
    1518   $(SOPHYAINCP)perrors.h \
    1519   $(SOPHYAINCP)fmath.h \
    1520   $(SOPHYAINCP)tvector.h \
    1521   $(SOPHYAINCP)tmatrix.h \
    1522   $(SOPHYAINCP)tarray.h \
    1523   $(SOPHYAINCP)basarr.h \
    1524   $(SOPHYAINCP)mutyv.h \
    1525   $(SOPHYAINCP)dvlist.h \
    1526   $(SOPHYAINCP)ndatablock.h \
    1527   $(SOPHYAINCP)utilarr.h \
    1528   $(SOPHYAINCP)pidrawer.h \
    1529   $(SOPHYAINCP)pibwdggen.h \
    1530   $(SOPHYAINCP)pisysdep.h \
    1531   $(SOPHYAINCP)piwdgx.h \
     1374  $(SOPHYAINCP)ntupintf.h $(SOPHYAINCP)poly.h \
     1375  $(SOPHYAINCP)peida.h $(SOPHYAINCP)utils.h \
     1376  $(SOPHYAINCP)perrors.h $(SOPHYAINCP)fmath.h \
     1377  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1378  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1379  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1380  $(SOPHYAINCP)ndatablock.h \
     1381  $(SOPHYAINCP)utilarr.h \
     1382  $(SOPHYAINCP)pidrawer.h \
     1383  $(SOPHYAINCP)pibwdggen.h \
     1384  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    15321385  $(SOPHYAINCP)piwdggen.h \
    15331386  $(SOPHYAINCP)pimsghandler.h \
    1534   $(SOPHYAINCP)picolist.h \
    1535   $(SOPHYAINCP)picmap.h \
     1387  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    15361388  $(SOPHYAINCP)picmapx.h \
    15371389  $(SOPHYAINCP)picmapgen.h \
    … …  
    15441396  $(SOPHYAINCP)pigraphuc.h \
    15451397  $(SOPHYAINCP)pievthandler.h \
    1546   $(SOPHYAINCP)psfile.h \
    1547   $(SOPHYAINCP)pigratt.h \
     1398  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    15481399  $(SOPHYAINCP)piaxes.h
    15491400        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigfd1.cc
    15501401 
    1551 $(SOPHYAOBJP)pigfd2.o: pigfd2.cc $(SOPHYAINCP)sopnamsp.h \
    1552   pigfd2.h $(SOPHYAINCP)generaldata.h \
    1553   $(SOPHYAINCP)objfio.h \
    1554   $(SOPHYAINCP)machdefs.h \
     1402$(SOPHYAOBJP)pigfd2.o: pigfd2.cc $(SOPHYAINCP)sopnamsp.h pigfd2.h \
     1403  $(SOPHYAINCP)generaldata.h \
     1404  $(SOPHYAINCP)objfio.h $(SOPHYAINCP)machdefs.h \
     1405  $(SOPHYAINCP)osx_values.h \
    15551406  $(SOPHYAINCP)anydataobj.h \
    15561407  $(SOPHYAINCP)ppersist.h \
    … …  
    15601411  $(SOPHYAINCP)rawstream.h \
    15611412  $(SOPHYAINCP)ppfnametag.h \
    1562   $(SOPHYAINCP)ntupintf.h \
    1563   $(SOPHYAINCP)poly.h \
    1564   $(SOPHYAINCP)peida.h \
    1565   $(SOPHYAINCP)utils.h \
    1566   $(SOPHYAINCP)perrors.h \
    1567   $(SOPHYAINCP)fmath.h \
    1568   $(SOPHYAINCP)tvector.h \
    1569   $(SOPHYAINCP)tmatrix.h \
    1570   $(SOPHYAINCP)tarray.h \
    1571   $(SOPHYAINCP)basarr.h \
    1572   $(SOPHYAINCP)mutyv.h \
    1573   $(SOPHYAINCP)dvlist.h \
    1574   $(SOPHYAINCP)ndatablock.h \
    1575   $(SOPHYAINCP)utilarr.h \
    1576   $(SOPHYAINCP)pi3ddrw.h \
     1413  $(SOPHYAINCP)ntupintf.h $(SOPHYAINCP)poly.h \
     1414  $(SOPHYAINCP)peida.h $(SOPHYAINCP)utils.h \
     1415  $(SOPHYAINCP)perrors.h $(SOPHYAINCP)fmath.h \
     1416  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1417  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1418  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1419  $(SOPHYAINCP)ndatablock.h \
     1420  $(SOPHYAINCP)utilarr.h $(SOPHYAINCP)pi3ddrw.h \
    15771421  $(SOPHYAINCP)pisysdep.h \
    15781422  $(SOPHYAINCP)pidrawer.h \
    15791423  $(SOPHYAINCP)pibwdggen.h \
    1580   $(SOPHYAINCP)piwdgx.h \
    1581   $(SOPHYAINCP)piwdggen.h \
    1582   $(SOPHYAINCP)pimsghandler.h \
    1583   $(SOPHYAINCP)picolist.h \
    1584   $(SOPHYAINCP)picmap.h \
     1424  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
     1425  $(SOPHYAINCP)pimsghandler.h \
     1426  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    15851427  $(SOPHYAINCP)picmapx.h \
    15861428  $(SOPHYAINCP)picmapgen.h \
    … …  
    15931435  $(SOPHYAINCP)pigraphuc.h \
    15941436  $(SOPHYAINCP)pievthandler.h \
    1595   $(SOPHYAINCP)psfile.h \
    1596   $(SOPHYAINCP)pigratt.h \
    1597   $(SOPHYAINCP)piaxes.h \
    1598   $(SOPHYAINCP)pieldrw.h \
     1437  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
     1438  $(SOPHYAINCP)piaxes.h $(SOPHYAINCP)pieldrw.h \
    15991439  $(SOPHYAINCP)pigraph3d.h
    16001440        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pigfd2.cc
    16011441 
    1602 $(SOPHYAOBJP)pihisto.o: pihisto.cc $(SOPHYAINCP)sopnamsp.h \
    1603   pihisto.h $(SOPHYAINCP)histos.h \
    1604   $(SOPHYAINCP)objfio.h \
    1605   $(SOPHYAINCP)machdefs.h \
     1442$(SOPHYAOBJP)pihisto.o: pihisto.cc $(SOPHYAINCP)sopnamsp.h pihisto.h \
     1443  $(SOPHYAINCP)histos.h $(SOPHYAINCP)objfio.h \
     1444  $(SOPHYAINCP)machdefs.h \
     1445  $(SOPHYAINCP)osx_values.h \
    16061446  $(SOPHYAINCP)anydataobj.h \
    16071447  $(SOPHYAINCP)ppersist.h \
    … …  
    16111451  $(SOPHYAINCP)rawstream.h \
    16121452  $(SOPHYAINCP)ppfnametag.h \
    1613   $(SOPHYAINCP)peida.h \
    1614   $(SOPHYAINCP)utils.h \
    1615   $(SOPHYAINCP)perrors.h \
    1616   $(SOPHYAINCP)fmath.h \
    1617   $(SOPHYAINCP)tvector.h \
    1618   $(SOPHYAINCP)tmatrix.h \
    1619   $(SOPHYAINCP)tarray.h \
    1620   $(SOPHYAINCP)basarr.h \
    1621   $(SOPHYAINCP)mutyv.h \
    1622   $(SOPHYAINCP)dvlist.h \
    1623   $(SOPHYAINCP)ndatablock.h \
    1624   $(SOPHYAINCP)utilarr.h \
    1625   $(SOPHYAINCP)pidrawer.h \
    1626   $(SOPHYAINCP)pibwdggen.h \
    1627   $(SOPHYAINCP)pisysdep.h \
    1628   $(SOPHYAINCP)piwdgx.h \
     1453  $(SOPHYAINCP)peida.h $(SOPHYAINCP)utils.h \
     1454  $(SOPHYAINCP)perrors.h $(SOPHYAINCP)fmath.h \
     1455  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1456  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1457  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1458  $(SOPHYAINCP)ndatablock.h \
     1459  $(SOPHYAINCP)utilarr.h \
     1460  $(SOPHYAINCP)pidrawer.h \
     1461  $(SOPHYAINCP)pibwdggen.h \
     1462  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    16291463  $(SOPHYAINCP)piwdggen.h \
    16301464  $(SOPHYAINCP)pimsghandler.h \
    1631   $(SOPHYAINCP)picolist.h \
    1632   $(SOPHYAINCP)picmap.h \
     1465  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    16331466  $(SOPHYAINCP)picmapx.h \
    16341467  $(SOPHYAINCP)picmapgen.h \
    … …  
    16411474  $(SOPHYAINCP)pigraphuc.h \
    16421475  $(SOPHYAINCP)pievthandler.h \
    1643   $(SOPHYAINCP)psfile.h \
    1644   $(SOPHYAINCP)pigratt.h \
    1645   $(SOPHYAINCP)piaxes.h \
    1646   $(SOPHYAINCP)hisprof.h
     1476  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
     1477  $(SOPHYAINCP)piaxes.h $(SOPHYAINCP)hisprof.h
    16471478        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pihisto.cc
    16481479 
    1649 $(SOPHYAOBJP)pihisto2d.o: pihisto2d.cc \
     1480$(SOPHYAOBJP)pihisto2d.o: pihisto2d.cc $(SOPHYAINCP)pisysdep.h \
     1481  $(SOPHYAINCP)machdefs.h \
     1482  $(SOPHYAINCP)osx_values.h \
    16501483  $(SOPHYAINCP)piapplx.h \
    16511484  $(SOPHYAINCP)piapplgen.h \
    … …  
    16531486  $(SOPHYAINCP)picontainerx.h \
    16541487  $(SOPHYAINCP)picontainergen.h \
    1655   $(SOPHYAINCP)piwdgx.h \
    1656   $(SOPHYAINCP)piwdggen.h \
     1488  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    16571489  $(SOPHYAINCP)picolist.h \
    16581490  $(SOPHYAINCP)pimenubarx.h \
    … …  
    16651497  $(SOPHYAINCP)pibwdgx.h \
    16661498  $(SOPHYAINCP)pibwdggen.h \
    1667   $(SOPHYAINCP)picmap.h \
    1668   $(SOPHYAINCP)picmapx.h \
     1499  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    16691500  $(SOPHYAINCP)picmapgen.h \
    16701501  $(SOPHYAINCP)pigraphx.h \
    … …  
    16811512  $(SOPHYAINCP)pioptmenux.h \
    16821513  $(SOPHYAINCP)pioptmenugen.h \
    1683   $(SOPHYAINCP)histos2.h \
    1684   $(SOPHYAINCP)peida.h \
    1685   $(SOPHYAINCP)utils.h \
    1686   $(SOPHYAINCP)perrors.h \
    1687   $(SOPHYAINCP)pexceptions.h \
    1688   $(SOPHYAINCP)fmath.h \
    1689   $(SOPHYAINCP)histos.h \
     1514  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)peida.h \
     1515  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     1516  $(SOPHYAINCP)pexceptions.h \
     1517  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)histos.h \
    16901518  $(SOPHYAINCP)objfio.h \
    16911519  $(SOPHYAINCP)anydataobj.h \
    1692   $(SOPHYAINCP)ppersist.h \
    1693   $(SOPHYAINCP)gnumd5.h \
    1694   $(SOPHYAINCP)ppfbinstream.h \
    1695   $(SOPHYAINCP)rawstream.h \
    1696   $(SOPHYAINCP)ppfnametag.h \
    1697   $(SOPHYAINCP)tvector.h \
    1698   $(SOPHYAINCP)tmatrix.h \
    1699   $(SOPHYAINCP)tarray.h \
    1700   $(SOPHYAINCP)basarr.h \
    1701   $(SOPHYAINCP)mutyv.h \
    1702   $(SOPHYAINCP)dvlist.h \
    1703   $(SOPHYAINCP)ndatablock.h \
    1704   $(SOPHYAINCP)utilarr.h \
    1705   $(SOPHYAINCP)pidrawer.h \
    1706   $(SOPHYAINCP)pigratt.h \
    1707   $(SOPHYAINCP)piaxes.h \
     1520  $(SOPHYAINCP)ppersist.h $(SOPHYAINCP)gnumd5.h \
     1521  $(SOPHYAINCP)ppfbinstream.h \
     1522  $(SOPHYAINCP)rawstream.h \
     1523  $(SOPHYAINCP)ppfnametag.h \
     1524  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1525  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1526  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1527  $(SOPHYAINCP)ndatablock.h \
     1528  $(SOPHYAINCP)utilarr.h \
     1529  $(SOPHYAINCP)pidrawer.h \
     1530  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    17081531  $(SOPHYAINCP)piscdrawwdg.h \
    17091532  $(SOPHYAINCP)piwindowx.h \
    … …  
    17151538 
    17161539$(SOPHYAOBJP)piinit.o: piinit.cc $(SOPHYAINCP)sopnamsp.h \
    1717   $(SOPHYAINCP)machdefs.h piinit.h \
     1540  $(SOPHYAINCP)machdefs.h \
     1541  $(SOPHYAINCP)osx_values.h piinit.h \
    17181542  $(SOPHYAINCP)sambainit.h \
    17191543  $(SOPHYAINCP)skymapinit.h \
    … …  
    17271551  $(SOPHYAINCP)picontainerx.h \
    17281552  $(SOPHYAINCP)picontainergen.h \
    1729   $(SOPHYAINCP)piwdgx.h \
    1730   $(SOPHYAINCP)piwdggen.h \
     1553  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    17311554  $(SOPHYAINCP)picolist.h \
    17321555  $(SOPHYAINCP)pimenubarx.h \
    … …  
    17391562  $(SOPHYAINCP)pibwdgx.h \
    17401563  $(SOPHYAINCP)pibwdggen.h \
    1741   $(SOPHYAINCP)picmap.h \
    1742   $(SOPHYAINCP)picmapx.h \
     1564  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    17431565  $(SOPHYAINCP)picmapgen.h \
    17441566  $(SOPHYAINCP)pigraphx.h \
    … …  
    17611583  $(SOPHYAINCP)periodic.h \
    17621584  $(SOPHYAINCP)piimage.h \
    1763   $(SOPHYAINCP)parradapter.h \
    1764   $(SOPHYAINCP)lut.h \
     1585  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    17651586  $(SOPHYAINCP)pieldrw.h \
    17661587  $(SOPHYAINCP)pidrawer.h \
    1767   $(SOPHYAINCP)pigratt.h \
    1768   $(SOPHYAINCP)piaxes.h \
     1588  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    17691589  $(SOPHYAINCP)pipixmapx.h \
    17701590  $(SOPHYAINCP)pipixmapgen.h \
    17711591  $(SOPHYAINCP)picmapview.h \
    1772   $(SOPHYAINCP)pi3dwdg.h \
    1773   $(SOPHYAINCP)pi3ddrw.h \
     1592  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    17741593  $(SOPHYAINCP)pigraph3d.h nobjmgr.h \
    17751594  $(SOPHYAINCP)anydataobj.h \
    … …  
    17801599  $(SOPHYAINCP)rawstream.h \
    17811600  $(SOPHYAINCP)ppfnametag.h \
    1782   $(SOPHYAINCP)dvlist.h \
    1783   $(SOPHYAINCP)objfio.h \
     1601  $(SOPHYAINCP)dvlist.h $(SOPHYAINCP)objfio.h \
    17841602  $(SOPHYAINCP)mutyv.h dlftypes.h piacmd.h \
    17851603  $(SOPHYAINCP)commander.h \
    1786   $(SOPHYAINCP)pdlmgr.h \
    1787   $(SOPHYAINCP)ctimer.h \
     1604  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)ctimer.h \
    17881605  $(SOPHYAINCP)zthread.h pisiadw.h \
    17891606  $(SOPHYAINCP)pilistx.h \
    … …  
    17911608  $(SOPHYAINCP)pistzwin.h \
    17921609  $(SOPHYAINCP)pitherm.h \
    1793   $(SOPHYAINCP)resusage.h servnobjm.h \
    1794   nomhistadapter.h nomgadapter.h \
    1795   $(SOPHYAINCP)ntupintf.h \
     1610  $(SOPHYAINCP)resusage.h servnobjm.h nomhistadapter.h \
     1611  nomgadapter.h $(SOPHYAINCP)ntupintf.h \
    17961612  $(SOPHYAINCP)generalfit.h \
    1797   $(SOPHYAINCP)tvector.h \
    1798   $(SOPHYAINCP)tmatrix.h \
    1799   $(SOPHYAINCP)tarray.h \
    1800   $(SOPHYAINCP)basarr.h \
    1801   $(SOPHYAINCP)ndatablock.h \
    1802   $(SOPHYAINCP)utilarr.h \
    1803   $(SOPHYAINCP)generaldata.h \
    1804   $(SOPHYAINCP)poly.h \
    1805   $(SOPHYAINCP)peida.h \
    1806   $(SOPHYAINCP)utils.h \
    1807   $(SOPHYAINCP)perrors.h \
    1808   $(SOPHYAINCP)fmath.h \
    1809   $(SOPHYAINCP)histos.h \
    1810   $(SOPHYAINCP)histos2.h \
    1811   $(SOPHYAINCP)hisprof.h \
    1812   $(SOPHYAINCP)histerr.h \
    1813   $(SOPHYAINCP)ntuple.h \
     1613  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1614  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1615  $(SOPHYAINCP)ndatablock.h \
     1616  $(SOPHYAINCP)utilarr.h \
     1617  $(SOPHYAINCP)generaldata.h \
     1618  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     1619  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     1620  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)histos.h \
     1621  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)hisprof.h \
     1622  $(SOPHYAINCP)histerr.h $(SOPHYAINCP)ntuple.h \
    18141623  $(SOPHYAINCP)xntuple.h \
    18151624  $(SOPHYAINCP)basedtable.h \
    18161625  $(SOPHYAINCP)segdatablock.h nomgfdadapter.h \
    18171626  nomimagadapter.h $(SOPHYAINCP)cimage.h \
    1818   $(SOPHYAINCP)fioarr.h nomtmatvecadapter.h \
    1819   nomtarradapter.h $(SOPHYAINCP)datatable.h \
     1627  $(SOPHYAINCP)fioarr.h nomtmatvecadapter.h nomtarradapter.h \
     1628  $(SOPHYAINCP)datatable.h \
    18201629  $(SOPHYAINCP)swppfdtable.h \
    18211630  $(SOPHYAINCP)swsegdb.h \
    18221631  $(SOPHYAINCP)ppfswapper.h \
    1823   $(SOPHYAINCP)ppftpointerio.h \
    1824   nomskymapadapter.h $(SOPHYAINCP)pixelmap.h \
     1632  $(SOPHYAINCP)ppftpointerio.h nomskymapadapter.h \
     1633  $(SOPHYAINCP)pixelmap.h \
    18251634  $(SOPHYAINCP)spherepos.h \
    18261635  $(SOPHYAINCP)unitvector.h \
    … …  
    18371646  $(SOPHYAINCP)specrespvector.h \
    18381647  $(SOPHYAINCP)specresp.h \
    1839   $(SOPHYAINCP)gaussfilt.h \
    1840   nomspecrespadapter.h
     1648  $(SOPHYAINCP)gaussfilt.h nomspecrespadapter.h
    18411649        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  piinit.cc
    18421650 
    1843 $(SOPHYAOBJP)pintup3d.o: pintup3d.cc \
    1844   $(SOPHYAINCP)sopnamsp.h pintup3d.h \
     1651$(SOPHYAOBJP)pintup3d.o: pintup3d.cc $(SOPHYAINCP)sopnamsp.h pintup3d.h \
    18451652  $(SOPHYAINCP)ntupintf.h \
    18461653  $(SOPHYAINCP)machdefs.h \
     1654  $(SOPHYAINCP)osx_values.h \
    18471655  $(SOPHYAINCP)pi3ddrw.h \
    18481656  $(SOPHYAINCP)pisysdep.h \
    18491657  $(SOPHYAINCP)pidrawer.h \
    18501658  $(SOPHYAINCP)pibwdggen.h \
    1851   $(SOPHYAINCP)piwdgx.h \
    1852   $(SOPHYAINCP)piwdggen.h \
    1853   $(SOPHYAINCP)pimsghandler.h \
    1854   $(SOPHYAINCP)picolist.h \
    1855   $(SOPHYAINCP)picmap.h \
     1659  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
     1660  $(SOPHYAINCP)pimsghandler.h \
     1661  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    18561662  $(SOPHYAINCP)picmapx.h \
    18571663  $(SOPHYAINCP)picmapgen.h \
    … …  
    18641670  $(SOPHYAINCP)pigraphuc.h \
    18651671  $(SOPHYAINCP)pievthandler.h \
    1866   $(SOPHYAINCP)psfile.h \
    1867   $(SOPHYAINCP)pigratt.h \
    1868   $(SOPHYAINCP)piaxes.h \
    1869   $(SOPHYAINCP)pieldrw.h \
     1672  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
     1673  $(SOPHYAINCP)piaxes.h $(SOPHYAINCP)pieldrw.h \
    18701674  $(SOPHYAINCP)pigraph3d.h
    18711675        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pintup3d.cc
    18721676 
    1873 $(SOPHYAOBJP)pintuple.o: pintuple.cc \
    1874   $(SOPHYAINCP)sopnamsp.h pintuple.h \
     1677$(SOPHYAOBJP)pintuple.o: pintuple.cc $(SOPHYAINCP)sopnamsp.h pintuple.h \
    18751678  $(SOPHYAINCP)ntupintf.h \
    18761679  $(SOPHYAINCP)machdefs.h \
    1877   $(SOPHYAINCP)pidrawer.h \
    1878   $(SOPHYAINCP)pibwdggen.h \
    1879   $(SOPHYAINCP)pisysdep.h \
    1880   $(SOPHYAINCP)piwdgx.h \
     1680  $(SOPHYAINCP)osx_values.h \
     1681  $(SOPHYAINCP)pidrawer.h \
     1682  $(SOPHYAINCP)pibwdggen.h \
     1683  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    18811684  $(SOPHYAINCP)piwdggen.h \
    18821685  $(SOPHYAINCP)pimsghandler.h \
    1883   $(SOPHYAINCP)picolist.h \
    1884   $(SOPHYAINCP)picmap.h \
     1686  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    18851687  $(SOPHYAINCP)picmapx.h \
    18861688  $(SOPHYAINCP)picmapgen.h \
    … …  
    18931695  $(SOPHYAINCP)pigraphuc.h \
    18941696  $(SOPHYAINCP)pievthandler.h \
    1895   $(SOPHYAINCP)psfile.h \
    1896   $(SOPHYAINCP)pigratt.h \
     1697  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    18971698  $(SOPHYAINCP)piaxes.h
    18981699        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pintuple.cc
    18991700 
    1900 $(SOPHYAOBJP)pipodrw.o: pipodrw.cc $(SOPHYAINCP)sopnamsp.h \
    1901   pipodrw.h $(SOPHYAINCP)machdefs.h \
    1902   $(SOPHYAINCP)pidrawer.h \
    1903   $(SOPHYAINCP)pibwdggen.h \
    1904   $(SOPHYAINCP)pisysdep.h \
    1905   $(SOPHYAINCP)piwdgx.h \
     1701$(SOPHYAOBJP)pipodrw.o: pipodrw.cc $(SOPHYAINCP)sopnamsp.h pipodrw.h \
     1702  $(SOPHYAINCP)machdefs.h \
     1703  $(SOPHYAINCP)osx_values.h \
     1704  $(SOPHYAINCP)pidrawer.h \
     1705  $(SOPHYAINCP)pibwdggen.h \
     1706  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    19061707  $(SOPHYAINCP)piwdggen.h \
    19071708  $(SOPHYAINCP)pimsghandler.h \
    1908   $(SOPHYAINCP)picolist.h \
    1909   $(SOPHYAINCP)picmap.h \
     1709  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    19101710  $(SOPHYAINCP)picmapx.h \
    19111711  $(SOPHYAINCP)picmapgen.h \
    … …  
    19181718  $(SOPHYAINCP)pigraphuc.h \
    19191719  $(SOPHYAINCP)pievthandler.h \
    1920   $(SOPHYAINCP)psfile.h \
    1921   $(SOPHYAINCP)pigratt.h \
     1720  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    19221721  $(SOPHYAINCP)piaxes.h \
    1923   $(SOPHYAINCP)parradapter.h \
    1924   $(SOPHYAINCP)lut.h \
    1925   $(SOPHYAINCP)histos2.h \
    1926   $(SOPHYAINCP)peida.h \
    1927   $(SOPHYAINCP)utils.h \
     1722  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
     1723  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)peida.h \
     1724  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
     1725  $(SOPHYAINCP)pexceptions.h \
     1726  $(SOPHYAINCP)fmath.h $(SOPHYAINCP)histos.h \
     1727  $(SOPHYAINCP)objfio.h \
     1728  $(SOPHYAINCP)anydataobj.h \
     1729  $(SOPHYAINCP)ppersist.h $(SOPHYAINCP)gnumd5.h \
     1730  $(SOPHYAINCP)ppfbinstream.h \
     1731  $(SOPHYAINCP)rawstream.h \
     1732  $(SOPHYAINCP)ppfnametag.h \
     1733  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1734  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1735  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1736  $(SOPHYAINCP)ndatablock.h \
     1737  $(SOPHYAINCP)utilarr.h \
     1738  $(SOPHYAINCP)generalfit.h \
     1739  $(SOPHYAINCP)generaldata.h \
     1740  $(SOPHYAINCP)ntupintf.h $(SOPHYAINCP)poly.h
     1741        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipodrw.cc
     1742 
     1743$(SOPHYAOBJP)pisiadw.o: pisiadw.cc $(SOPHYAINCP)sopnamsp.h \
     1744  $(SOPHYAINCP)machdefs.h \
     1745  $(SOPHYAINCP)osx_values.h \
    19281746  $(SOPHYAINCP)perrors.h \
    19291747  $(SOPHYAINCP)pexceptions.h \
    1930   $(SOPHYAINCP)fmath.h \
    1931   $(SOPHYAINCP)histos.h \
    1932   $(SOPHYAINCP)objfio.h \
    1933   $(SOPHYAINCP)anydataobj.h \
    1934   $(SOPHYAINCP)ppersist.h \
    1935   $(SOPHYAINCP)gnumd5.h \
    1936   $(SOPHYAINCP)ppfbinstream.h \
    1937   $(SOPHYAINCP)rawstream.h \
    1938   $(SOPHYAINCP)ppfnametag.h \
    1939   $(SOPHYAINCP)tvector.h \
    1940   $(SOPHYAINCP)tmatrix.h \
    1941   $(SOPHYAINCP)tarray.h \
    1942   $(SOPHYAINCP)basarr.h \
    1943   $(SOPHYAINCP)mutyv.h \
    1944   $(SOPHYAINCP)dvlist.h \
    1945   $(SOPHYAINCP)ndatablock.h \
    1946   $(SOPHYAINCP)utilarr.h \
    1947   $(SOPHYAINCP)generalfit.h \
    1948   $(SOPHYAINCP)generaldata.h \
    1949   $(SOPHYAINCP)ntupintf.h \
    1950   $(SOPHYAINCP)poly.h
    1951         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pipodrw.cc
    1952  
    1953 $(SOPHYAOBJP)pisiadw.o: pisiadw.cc $(SOPHYAINCP)sopnamsp.h \
    1954   $(SOPHYAINCP)machdefs.h \
    1955   $(SOPHYAINCP)perrors.h \
    1956   $(SOPHYAINCP)pexceptions.h \
    1957   $(SOPHYAINCP)ctimer.h \
    1958   $(SOPHYAINCP)nbmath.h \
     1748  $(SOPHYAINCP)ctimer.h $(SOPHYAINCP)nbmath.h \
    19591749  $(SOPHYAINCP)smathconst.h pistdimgapp.h \
    19601750  $(SOPHYAINCP)pisysdep.h \
    … …  
    19641754  $(SOPHYAINCP)picontainerx.h \
    19651755  $(SOPHYAINCP)picontainergen.h \
    1966   $(SOPHYAINCP)piwdgx.h \
    1967   $(SOPHYAINCP)piwdggen.h \
     1756  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    19681757  $(SOPHYAINCP)picolist.h \
    19691758  $(SOPHYAINCP)pimenubarx.h \
    … …  
    19761765  $(SOPHYAINCP)pibwdgx.h \
    19771766  $(SOPHYAINCP)pibwdggen.h \
    1978   $(SOPHYAINCP)picmap.h \
    1979   $(SOPHYAINCP)picmapx.h \
     1767  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    19801768  $(SOPHYAINCP)picmapgen.h \
    19811769  $(SOPHYAINCP)pigraphx.h \
    … …  
    19981786  $(SOPHYAINCP)periodic.h \
    19991787  $(SOPHYAINCP)piimage.h \
    2000   $(SOPHYAINCP)parradapter.h \
    2001   $(SOPHYAINCP)lut.h \
     1788  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    20021789  $(SOPHYAINCP)pieldrw.h \
    20031790  $(SOPHYAINCP)pidrawer.h \
    2004   $(SOPHYAINCP)pigratt.h \
    2005   $(SOPHYAINCP)piaxes.h \
     1791  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    20061792  $(SOPHYAINCP)pipixmapx.h \
    20071793  $(SOPHYAINCP)pipixmapgen.h \
    20081794  $(SOPHYAINCP)picmapview.h \
    2009   $(SOPHYAINCP)pi3dwdg.h \
    2010   $(SOPHYAINCP)pi3ddrw.h \
     1795  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    20111796  $(SOPHYAINCP)pigraph3d.h nobjmgr.h \
    20121797  $(SOPHYAINCP)anydataobj.h \
    2013   $(SOPHYAINCP)ppersist.h \
    2014   $(SOPHYAINCP)gnumd5.h \
    2015   $(SOPHYAINCP)ppfbinstream.h \
    2016   $(SOPHYAINCP)rawstream.h \
    2017   $(SOPHYAINCP)ppfnametag.h \
    2018   $(SOPHYAINCP)dvlist.h \
    2019   $(SOPHYAINCP)objfio.h \
     1798  $(SOPHYAINCP)ppersist.h $(SOPHYAINCP)gnumd5.h \
     1799  $(SOPHYAINCP)ppfbinstream.h \
     1800  $(SOPHYAINCP)rawstream.h \
     1801  $(SOPHYAINCP)ppfnametag.h \
     1802  $(SOPHYAINCP)dvlist.h $(SOPHYAINCP)objfio.h \
    20201803  $(SOPHYAINCP)mutyv.h dlftypes.h piacmd.h \
    20211804  $(SOPHYAINCP)commander.h \
    2022   $(SOPHYAINCP)pdlmgr.h \
    2023   $(SOPHYAINCP)zthread.h pisiadw.h \
    2024   $(SOPHYAINCP)pilistx.h \
     1805  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)zthread.h \
     1806  pisiadw.h $(SOPHYAINCP)pilistx.h \
    20251807  $(SOPHYAINCP)pilistgen.h \
    20261808  $(SOPHYAINCP)pistzwin.h \
    … …  
    20291811        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pisiadw.cc
    20301812 
    2031 $(SOPHYAOBJP)pistdimgapp.o: pistdimgapp.cc \
    2032   $(SOPHYAINCP)sopnamsp.h \
    2033   $(SOPHYAINCP)machdefs.h \
    2034   $(SOPHYAINCP)strutil.h \
    2035   $(SOPHYAINCP)timing.h \
     1813$(SOPHYAOBJP)pistdimgapp.o: pistdimgapp.cc $(SOPHYAINCP)sopnamsp.h \
     1814  $(SOPHYAINCP)machdefs.h \
     1815  $(SOPHYAINCP)osx_values.h \
     1816  $(SOPHYAINCP)strutil.h $(SOPHYAINCP)timing.h \
    20361817  $(SOPHYAINCP)perrors.h \
    20371818  $(SOPHYAINCP)pexceptions.h \
    2038   $(SOPHYAINCP)ctimer.h \
    2039   $(SOPHYAINCP)psighand.h \
    2040   $(SOPHYAINCP)cimage.h \
    2041   $(SOPHYAINCP)tmatrix.h \
    2042   $(SOPHYAINCP)tarray.h \
    2043   $(SOPHYAINCP)basarr.h \
    2044   $(SOPHYAINCP)anydataobj.h \
    2045   $(SOPHYAINCP)mutyv.h \
    2046   $(SOPHYAINCP)dvlist.h \
    2047   $(SOPHYAINCP)objfio.h \
    2048   $(SOPHYAINCP)ppersist.h \
    2049   $(SOPHYAINCP)gnumd5.h \
    2050   $(SOPHYAINCP)ppfbinstream.h \
    2051   $(SOPHYAINCP)rawstream.h \
    2052   $(SOPHYAINCP)ppfnametag.h \
    2053   $(SOPHYAINCP)ndatablock.h \
    2054   $(SOPHYAINCP)utilarr.h \
    2055   $(SOPHYAINCP)fioarr.h \
     1819  $(SOPHYAINCP)ctimer.h $(SOPHYAINCP)psighand.h \
     1820  $(SOPHYAINCP)cimage.h $(SOPHYAINCP)tmatrix.h \
     1821  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1822  $(SOPHYAINCP)anydataobj.h \
     1823  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1824  $(SOPHYAINCP)objfio.h $(SOPHYAINCP)ppersist.h \
     1825  $(SOPHYAINCP)gnumd5.h \
     1826  $(SOPHYAINCP)ppfbinstream.h \
     1827  $(SOPHYAINCP)rawstream.h \
     1828  $(SOPHYAINCP)ppfnametag.h \
     1829  $(SOPHYAINCP)ndatablock.h \
     1830  $(SOPHYAINCP)utilarr.h $(SOPHYAINCP)fioarr.h \
    20561831  $(SOPHYAINCP)tvector.h pistdimgapp.h \
    20571832  $(SOPHYAINCP)pisysdep.h \
    … …  
    20611836  $(SOPHYAINCP)picontainerx.h \
    20621837  $(SOPHYAINCP)picontainergen.h \
    2063   $(SOPHYAINCP)piwdgx.h \
    2064   $(SOPHYAINCP)piwdggen.h \
     1838  $(SOPHYAINCP)piwdgx.h $(SOPHYAINCP)piwdggen.h \
    20651839  $(SOPHYAINCP)picolist.h \
    20661840  $(SOPHYAINCP)pimenubarx.h \
    … …  
    20731847  $(SOPHYAINCP)pibwdgx.h \
    20741848  $(SOPHYAINCP)pibwdggen.h \
    2075   $(SOPHYAINCP)picmap.h \
    2076   $(SOPHYAINCP)picmapx.h \
     1849  $(SOPHYAINCP)picmap.h $(SOPHYAINCP)picmapx.h \
    20771850  $(SOPHYAINCP)picmapgen.h \
    20781851  $(SOPHYAINCP)pigraphx.h \
    … …  
    20951868  $(SOPHYAINCP)periodic.h \
    20961869  $(SOPHYAINCP)piimage.h \
    2097   $(SOPHYAINCP)parradapter.h \
    2098   $(SOPHYAINCP)lut.h \
     1870  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    20991871  $(SOPHYAINCP)pieldrw.h \
    21001872  $(SOPHYAINCP)pidrawer.h \
    2101   $(SOPHYAINCP)pigratt.h \
    2102   $(SOPHYAINCP)piaxes.h \
     1873  $(SOPHYAINCP)pigratt.h $(SOPHYAINCP)piaxes.h \
    21031874  $(SOPHYAINCP)pipixmapx.h \
    21041875  $(SOPHYAINCP)pipixmapgen.h \
    21051876  $(SOPHYAINCP)picmapview.h \
    2106   $(SOPHYAINCP)pi3dwdg.h \
    2107   $(SOPHYAINCP)pi3ddrw.h \
    2108   $(SOPHYAINCP)pigraph3d.h nobjmgr.h \
    2109   dlftypes.h piacmd.h \
     1877  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
     1878  $(SOPHYAINCP)pigraph3d.h nobjmgr.h dlftypes.h piacmd.h \
    21101879  $(SOPHYAINCP)commander.h \
    2111   $(SOPHYAINCP)pdlmgr.h \
    2112   $(SOPHYAINCP)zthread.h pisiadw.h \
    2113   $(SOPHYAINCP)pilistx.h \
     1880  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)zthread.h \
     1881  pisiadw.h $(SOPHYAINCP)pilistx.h \
    21141882  $(SOPHYAINCP)pilistgen.h \
    21151883  $(SOPHYAINCP)pistzwin.h \
    … …  
    21281896        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pistdimgapp.cc
    21291897 
    2130 $(SOPHYAOBJP)pitvmaad.o: pitvmaad.cc \
    2131   $(SOPHYAINCP)sopnamsp.h pitvmaad.h \
    2132   $(SOPHYAINCP)machdefs.h \
    2133   $(SOPHYAINCP)parradapter.h \
    2134   $(SOPHYAINCP)lut.h \
    2135   $(SOPHYAINCP)tmatrix.h \
    2136   $(SOPHYAINCP)tarray.h \
     1898$(SOPHYAOBJP)pitvmaad.o: pitvmaad.cc $(SOPHYAINCP)sopnamsp.h pitvmaad.h \
     1899  $(SOPHYAINCP)machdefs.h \
     1900  $(SOPHYAINCP)osx_values.h \
     1901  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
     1902  $(SOPHYAINCP)tmatrix.h $(SOPHYAINCP)tarray.h \
    21371903  $(SOPHYAINCP)basarr.h \
    21381904  $(SOPHYAINCP)anydataobj.h \
    2139   $(SOPHYAINCP)mutyv.h \
    2140   $(SOPHYAINCP)dvlist.h \
    2141   $(SOPHYAINCP)objfio.h \
     1905  $(SOPHYAINCP)mutyv.h $(SOPHYAINCP)dvlist.h \
     1906  $(SOPHYAINCP)objfio.h $(SOPHYAINCP)ppersist.h \
     1907  $(SOPHYAINCP)pexceptions.h \
     1908  $(SOPHYAINCP)gnumd5.h \
     1909  $(SOPHYAINCP)ppfbinstream.h \
     1910  $(SOPHYAINCP)rawstream.h \
     1911  $(SOPHYAINCP)ppfnametag.h \
     1912  $(SOPHYAINCP)ndatablock.h \
     1913  $(SOPHYAINCP)utilarr.h $(SOPHYAINCP)tvector.h
     1914        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitvmaad.cc
     1915 
     1916$(SOPHYAOBJP)servnobjm.o: servnobjm.cc $(SOPHYAINCP)sopnamsp.h \
     1917  $(SOPHYAINCP)strutil.h nobjmgr.h \
     1918  $(SOPHYAINCP)machdefs.h \
     1919  $(SOPHYAINCP)osx_values.h \
     1920  $(SOPHYAINCP)anydataobj.h \
    21421921  $(SOPHYAINCP)ppersist.h \
    21431922  $(SOPHYAINCP)pexceptions.h \
    … …  
    21461925  $(SOPHYAINCP)rawstream.h \
    21471926  $(SOPHYAINCP)ppfnametag.h \
    2148   $(SOPHYAINCP)ndatablock.h \
    2149   $(SOPHYAINCP)utilarr.h \
    2150   $(SOPHYAINCP)tvector.h
    2151         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  pitvmaad.cc
    2152  
    2153 $(SOPHYAOBJP)servnobjm.o: servnobjm.cc \
    2154   $(SOPHYAINCP)sopnamsp.h \
    2155   $(SOPHYAINCP)strutil.h nobjmgr.h \
    2156   $(SOPHYAINCP)machdefs.h \
    2157   $(SOPHYAINCP)anydataobj.h \
    2158   $(SOPHYAINCP)ppersist.h \
    2159   $(SOPHYAINCP)pexceptions.h \
    2160   $(SOPHYAINCP)gnumd5.h \
    2161   $(SOPHYAINCP)ppfbinstream.h \
    2162   $(SOPHYAINCP)rawstream.h \
    2163   $(SOPHYAINCP)ppfnametag.h \
    2164   $(SOPHYAINCP)dvlist.h \
    2165   $(SOPHYAINCP)objfio.h \
     1927  $(SOPHYAINCP)dvlist.h $(SOPHYAINCP)objfio.h \
    21661928  $(SOPHYAINCP)mutyv.h dlftypes.h servnobjm.h \
    2167   $(SOPHYAINCP)pdlmgr.h \
    2168   $(SOPHYAINCP)zthread.h nomgadapter.h \
    2169   $(SOPHYAINCP)pidrawer.h \
    2170   $(SOPHYAINCP)pibwdggen.h \
    2171   $(SOPHYAINCP)pisysdep.h \
    2172   $(SOPHYAINCP)piwdgx.h \
     1929  $(SOPHYAINCP)pdlmgr.h $(SOPHYAINCP)zthread.h \
     1930  nomgadapter.h $(SOPHYAINCP)pidrawer.h \
     1931  $(SOPHYAINCP)pibwdggen.h \
     1932  $(SOPHYAINCP)pisysdep.h $(SOPHYAINCP)piwdgx.h \
    21731933  $(SOPHYAINCP)piwdggen.h \
    21741934  $(SOPHYAINCP)pimsghandler.h \
    2175   $(SOPHYAINCP)picolist.h \
    2176   $(SOPHYAINCP)picmap.h \
     1935  $(SOPHYAINCP)picolist.h $(SOPHYAINCP)picmap.h \
    21771936  $(SOPHYAINCP)picmapx.h \
    21781937  $(SOPHYAINCP)picmapgen.h \
    … …  
    21851944  $(SOPHYAINCP)pigraphuc.h \
    21861945  $(SOPHYAINCP)pievthandler.h \
    2187   $(SOPHYAINCP)psfile.h \
    2188   $(SOPHYAINCP)pigratt.h \
     1946  $(SOPHYAINCP)psfile.h $(SOPHYAINCP)pigratt.h \
    21891947  $(SOPHYAINCP)piaxes.h \
    2190   $(SOPHYAINCP)parradapter.h \
    2191   $(SOPHYAINCP)lut.h \
     1948  $(SOPHYAINCP)parradapter.h $(SOPHYAINCP)lut.h \
    21921949  $(SOPHYAINCP)ntupintf.h \
    21931950  $(SOPHYAINCP)generalfit.h \
    2194   $(SOPHYAINCP)tvector.h \
    2195   $(SOPHYAINCP)tmatrix.h \
    2196   $(SOPHYAINCP)tarray.h \
    2197   $(SOPHYAINCP)basarr.h \
    2198   $(SOPHYAINCP)ndatablock.h \
    2199   $(SOPHYAINCP)utilarr.h \
    2200   $(SOPHYAINCP)generaldata.h \
    2201   $(SOPHYAINCP)poly.h \
    2202   $(SOPHYAINCP)peida.h \
    2203   $(SOPHYAINCP)utils.h \
    2204   $(SOPHYAINCP)perrors.h \
     1951  $(SOPHYAINCP)tvector.h $(SOPHYAINCP)tmatrix.h \
     1952  $(SOPHYAINCP)tarray.h $(SOPHYAINCP)basarr.h \
     1953  $(SOPHYAINCP)ndatablock.h \
     1954  $(SOPHYAINCP)utilarr.h \
     1955  $(SOPHYAINCP)generaldata.h \
     1956  $(SOPHYAINCP)poly.h $(SOPHYAINCP)peida.h \
     1957  $(SOPHYAINCP)utils.h $(SOPHYAINCP)perrors.h \
    22051958  $(SOPHYAINCP)fmath.h pistdimgapp.h \
    22061959  $(SOPHYAINCP)piapplx.h \
    … …  
    22251978  $(SOPHYAINCP)piperiodx.h \
    22261979  $(SOPHYAINCP)periodic.h \
    2227   $(SOPHYAINCP)piimage.h \
    2228   $(SOPHYAINCP)pieldrw.h \
     1980  $(SOPHYAINCP)piimage.h $(SOPHYAINCP)pieldrw.h \
    22291981  $(SOPHYAINCP)pipixmapx.h \
    22301982  $(SOPHYAINCP)pipixmapgen.h \
    22311983  $(SOPHYAINCP)picmapview.h \
    2232   $(SOPHYAINCP)pi3dwdg.h \
    2233   $(SOPHYAINCP)pi3ddrw.h \
     1984  $(SOPHYAINCP)pi3dwdg.h $(SOPHYAINCP)pi3ddrw.h \
    22341985  $(SOPHYAINCP)pigraph3d.h piacmd.h \
    22351986  $(SOPHYAINCP)commander.h \
    … …  
    22421993  $(SOPHYAINCP)fct1dfit.h \
    22431994  $(SOPHYAINCP)fct2dfit.h pitvmaad.h \
    2244   $(SOPHYAINCP)ntuple.h \
    2245   $(SOPHYAINCP)cimage.h \
    2246   $(SOPHYAINCP)fioarr.h \
    2247   $(SOPHYAINCP)histos.h \
    2248   $(SOPHYAINCP)histos2.h \
    2249   $(SOPHYAINCP)hisprof.h \
     1995  $(SOPHYAINCP)ntuple.h $(SOPHYAINCP)cimage.h \
     1996  $(SOPHYAINCP)fioarr.h $(SOPHYAINCP)histos.h \
     1997  $(SOPHYAINCP)histos2.h $(SOPHYAINCP)hisprof.h \
    22501998  $(SOPHYAINCP)piyfxdrw.h \
    2251   $(SOPHYAINCP)pisurfdr.h pintuple.h \
    2252   pintup3d.h pipodrw.h
     1999  $(SOPHYAINCP)pisurfdr.h pintuple.h pintup3d.h pipodrw.h
    22532000        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  servnobjm.cc
    22542001 

  • trunk/SophyaPI/PIext/basexecut.cc

    r2755 r2781  
    1616#include "servnobjm.h"
    1717#include "nomgadapter.h"
    18 #include "piyfxdrw.h"
    19 #include "pibargraph.h"
    20 #include "pitxtdrw.h"
    2118
    2219#include "histos.h"
    … …  
    5148
    5249
    53 /* Macro pour tester si flag normalized coordinate est present */
    54 #define _CkBoolNC_(_jk_) ((tokens.size()>_jk_) && (tokens[_jk_] == "true")) ? true : false;
    55 
    5650
    5751/* --Methode-- */
    … …  
    6458  mpiac->LoadModule(tokens[0], tokens[1]);
    6559  }
    66 // >>>>>>>>>>> Fenetre graphique , changement d'attributs graphiques
    67 else if (kw == "zone") {
    68   while (tokens.size() < 2) tokens.push_back("1");
    69   int nx, ny;
    70   nx = ny = 1;
    71   nx = atoi(tokens[0].c_str());    ny = atoi(tokens[1].c_str());
    72   if (mImgApp) {
    73     mImgApp->LockMutex();  // <ZThread> global event loop synchronisation
    74     mImgApp->SetZone(nx, ny);
    75     mImgApp->UnlockMutex(true);  // <ZThread> global event loop synchronisation
    76   }
    77 } 
    78 else if (kw == "newwin") {
    79   int nx=1, ny=1;
    80   int sx=0, sy=0;
    81   //if(tokens.size() < 2) { cout << "Usage: newwin nx ny" << endl;  return(0); }
    82   if(tokens.size() > 0) nx = atoi(tokens[0].c_str());
    83   if(tokens.size() > 1) ny = atoi(tokens[1].c_str());
    84   if(tokens.size() > 3) {
    85     sx = atoi(tokens[2].c_str());
    86     sy = atoi(tokens[3].c_str());
    87   }
    88   if (mImgApp) {
    89     mImgApp->LockMutex();   // <ZThread> global event loop synchronisation
    90     mImgApp->CreateGraphWin(nx, ny, sx, sy);
    91     mImgApp->UnlockMutex(true); // <ZThread> global event loop synchronisation
    92   }
    93 } 
    94 else if (kw == "stacknext") {
    95   mImgApp->LockMutex();  // <ZThread> global event loop synchronisation
    96   mImgApp->StackWinNext();
    97   mImgApp->UnlockMutex(true);  // <ZThread> global event loop synchronisation
    98 }
    99 else if (kw == "graphicatt") {
    100   if (tokens.size() < 1) { cout << "Usage: graphicatt attributes_list (att=def->defaut)" << endl;  return(0); }
    101   string opts = tokens[0];
    102   if (tokens.size() > 1)
    103     for(unsigned int kt=1; kt<tokens.size(); kt++)  { opts += ' '; opts += tokens[kt]; }
    104   if (mImgApp) mImgApp->SetDefaultGraphicAttributes(opts);
    105   }
    106 else if (kw == "setaxesatt") {
    107   if (tokens.size() < 1) { cout << "Usage: setaxesatt attributes_list " << endl;  return(0); }
    108   string opts = tokens[0];
    109   if (tokens.size() > 1)
    110     for(unsigned int kt=1; kt<tokens.size(); kt++)  { opts += ' '; opts += tokens[kt]; }
    111   if (mImgApp) mImgApp->SetDefaultAxesAttributes(opts);
    112   }
    113 else if (kw == "setinsetlimits") {
    114   if (tokens.size() < 4) { cout << "Usage: setinsetlimits xmin xmax ymin ymax" << endl;  return(0); }
    115   double xmin = atof(tokens[0].c_str());
    116   double xmax = atof(tokens[1].c_str());
    117   double ymin = atof(tokens[2].c_str());
    118   double ymax = atof(tokens[3].c_str());
    119   mImgApp->SetInsetLimits(xmin, xmax, ymin, ymax);
    120   }
    121 else if (kw == "drpanel") {
    122   if (tokens.size() < 4) {
    123     cout << "Usage: drpanel xmin xmax ymin ymax [gratt] [name]" << endl; 
    124     return(0);
    125   }
    126   double xmin = atof(tokens[0].c_str());
    127   double xmax = atof(tokens[1].c_str());
    128   double ymin = atof(tokens[2].c_str());
    129   double ymax = atof(tokens[3].c_str());
    130   char buff[128];
    131   sprintf(buff, "axesnone xylimits=%g,%g,%g,%g ", xmin, xmax, ymin, ymax);
    132   string sop = buff;
    133   if (tokens.size() > 4) sop += tokens[4];
    134   string name;
    135   if (tokens.size() > 5) name = tokens[5];
    136   PIFuncDrawer* gdr = new PIFuncDrawer(NULL);
    137   mImgApp->DispScDrawer(gdr, name, sop);
    138 }
    139 else if (kw == "addtext") {
    140   if (tokens.size() < 3) {
    141     cout << "Usage: addtext x y txt [colfontatt] [fgnc]" << endl; 
    142     return(0);
    143   }
    144   double xp = atof(tokens[0].c_str());
    145   double yp = atof(tokens[1].c_str());
    146   string txt = tokens[2];
    147   string sop;
    148   if (tokens.size() > 3) sop = tokens[3];
    149   bool fgnc = _CkBoolNC_(4); 
    150   mImgApp->AddText(txt, xp, yp, sop, fgnc);
    151   }
    152 else if (kw == "addctext") {
    153   if (tokens.size() < 5) {
    154     cout << "Usage: addctext x y txt s_up s_dn [colfontatt] [updnfatt] [fgnc] " << endl; 
    155     return(0);
    156   }
    157   double xp = atof(tokens[0].c_str());
    158   double yp = atof(tokens[1].c_str());
    159   string sop;
    160   if (tokens.size() > 5) sop = tokens[5];
    161   string sopfss;
    162   if (tokens.size() > 6) sopfss = tokens[6];
    163   bool fgnc = _CkBoolNC_(7); 
    164   mImgApp->AddCompText(tokens[2], tokens[3], tokens[4], xp, yp, sop, sopfss, fgnc);
    165   }
    166 else if ((kw == "addline") || (kw == "addrect") || (kw == "addfrect") ||
    167          (kw == "addoval") || (kw == "addfoval") ||
    168          (kw == "addarrow") ) {
    169   if (tokens.size() < 4) {
    170     if ( (kw == "addoval") || (kw == "addfoval") )
    171       cout << "Usage  addoval/addfoval/addarrow xc yc dx dy [colatt] [fgnc]" << endl; 
    172     else
    173       cout << "Usage: addline/addrect/addfrect/addarrow x1 y1 x2 y2 [colatt] [fgnc]" << endl; 
    174     return(0);
    175   }
    176   double xp1 = atof(tokens[0].c_str());
    177   double yp1 = atof(tokens[1].c_str());
    178   double xp2 = atof(tokens[2].c_str());
    179   double yp2 = atof(tokens[3].c_str());
    180   string sop;
    181   if (tokens.size() > 4) sop = tokens[4];
    182   bool fgnc = _CkBoolNC_(5); 
    183   if (kw == "addline") mImgApp->AddLine(xp1, yp1, xp2, yp2, sop, false, fgnc);
    184   else if (kw == "addarrow") mImgApp->AddLine(xp1, yp1, xp2, yp2, sop, true, fgnc);
    185   else {
    186     bool fgfill = ((kw == "addrect") || (kw == "addoval")) ? false : true;
    187     if ( (kw == "addrect") || (kw == "addfrect") )
    188       mImgApp->AddRectangle(xp1, yp1, xp2, yp2, sop, fgfill, fgnc);
    189     else  mImgApp->AddOval(xp1, yp1, xp2, yp2, sop, fgfill, fgnc);
    190   }
    191 }
    192 else if ((kw == "addcirc") || (kw == "addfcirc")) {
    193   if (tokens.size() < 3) {
    194     cout << "Usage: addcirc/addfcirc xc yc r [colatt] [fgnc]" << endl; 
    195     return(0);
    196   }
    197   double xc = atof(tokens[0].c_str());
    198   double yc = atof(tokens[1].c_str());
    199   double rad = atof(tokens[2].c_str());
    200   string sop;
    201   if (tokens.size() > 3) sop = tokens[3];
    202   bool fgnc = _CkBoolNC_(4); 
    203   bool fgfill = (kw == "addcirc") ? false : true;
    204   mImgApp->AddCircle(xc, yc, rad, sop, fgfill, fgnc);
    205   }
    206 else if ((kw == "addarca") || (kw == "addfarca")) {
    207   if (tokens.size() < 5) {
    208     cout << "Usage: addarca/addfarca xc yc r a da [colatt] [fgnc]" << endl; 
    209     return(0);
    210   }
    211   double xc = atof(tokens[0].c_str());
    212   double yc = atof(tokens[1].c_str());
    213   double rad = atof(tokens[2].c_str());
    214   double ang = atof(tokens[3].c_str());
    215   double dang = atof(tokens[4].c_str());
    216   string sop;
    217   if (tokens.size() > 5) sop = tokens[5];
    218   bool fgnc = _CkBoolNC_(6); 
    219   bool fgfill = (kw == "addarca") ? false : true;
    220   mImgApp->AddArc(xc, yc, rad, ang, dang, sop, fgfill, fgnc);
    221   }
    222 else if (kw == "addmarker") {
    223   if (tokens.size() < 2) {
    224     cout << "Usage: addmarker x y [gratt] [fgnc]" << endl; 
    225     return(0);
    226   }
    227   double xm = atof(tokens[0].c_str());
    228   double ym = atof(tokens[1].c_str());
    229   string sop;
    230   if (tokens.size() > 2) sop = tokens[2];
    231   bool fgnc = _CkBoolNC_(3); 
    232   mImgApp->AddCircle(xm, ym, -1, sop, false, fgnc);
    233 }
    234 else if ((kw == "addarc") || (kw == "addfarc") ) {
    235   if (tokens.size() < 6) {
    236     cout << "Usage: addarc/addfarc x1 y1 x2 y2 x3 y3 [gratt] [fgnc]" << endl; 
    237     return(0);
    238   }
    239   double x1 = atof(tokens[0].c_str());
    240   double y1 = atof(tokens[1].c_str());
    241   double x2 = atof(tokens[2].c_str());
    242   double y2 = atof(tokens[3].c_str());
    243   double x3 = atof(tokens[4].c_str());
    244   double y3 = atof(tokens[5].c_str());
    245   string sop;
    246   if (tokens.size() > 6) sop = tokens[6];
    247   bool fgnc = _CkBoolNC_(7); 
    248   bool fgfill = (kw == "addarc") ? false : true;
    249   mImgApp->AddArc(x1, y1, x2, y2, x3, y3, sop, fgfill, fgnc);
    250 }
    251 else if ((kw == "addpoly") || (kw == "addfpoly")) {
    252   if (tokens.size() < 1) {
    253     cout << "Usage: addpoly/addfpoly 'x1,y1 x2,y2 x3,y3 ...' [gratt] [fgnc]" << endl; 
    254     return(0);
    255   }
    256   vector<string> sxy;
    257   vector<double> xpol, ypol;
    258   double xp, yp;
    259   FillVStringFrString(tokens[0], sxy);
    260   for(int jkk=0; jkk<sxy.size(); jkk++) {
    261     xp = yp = 0;
    262     if (sscanf(sxy[jkk].c_str(), "%lg,%lg", &xp, &yp) == 2) {
    263       xpol.push_back(xp);
    264       ypol.push_back(yp);
    265     }
    266   }
    267   string sop;
    268   if (tokens.size() > 1) sop = tokens[1];
    269   bool fgnc = _CkBoolNC_(2); 
    270   bool fgfill = (kw == "addpoly") ? false : true;
    271   mImgApp->AddPoly(xpol, ypol, sop, fgfill, fgnc);
    272   }
    273 
    274 
    275 else if ((kw == "settitle") || (kw == "addtitle")) {
    276   if (tokens.size() < 1) { cout << "Usage: settitle/addtitle TopTitle [BotTitle] [fontatt]" << endl;  return(0); }
    277   if(tokens.size()<2) tokens.push_back("");
    278   string gropt;
    279   if(tokens.size()>2) gropt = tokens[2];
    280   mImgApp->SetTitle(tokens[0], tokens[1], gropt);
    281 }
    282 
    283 else if ((kw == "setaxelabels") || (kw == "addaxelabels")) {
    284   if (tokens.size() < 2) { cout << "Usage: setaxelabels/addaxelabels xLabel yLabel [fontatt]" << endl;  return(0); }
    285   string gropt;
    286   if(tokens.size()>2) gropt = tokens[2];
    287   mImgApp->SetAxeLabels(tokens[0], tokens[1], gropt);
    288 }
    28960 
    29061// >>>>>>>>>>> Link dynamique de fonctions C++
    … …  
    721492
    722493
    723 // >>>>>>>>>>>  Affichage des objets
    724 else if ( (kw == "disp") || (kw == "surf") || (kw == "imag") || (kw == "imagnav") ) {
    725   if (tokens.size() < 1) { cout << "Usage: disp/surf/imag/imagnav nameobj [opt]" << endl; return(0); }
    726   string opt = "next";
    727   if (tokens.size() > 1)  opt = tokens[1];
    728   if (kw == "disp") mObjMgr->DisplayObj(tokens[0], opt);
    729   else if (kw == "surf")  mObjMgr->DisplaySurf3D(tokens[0], opt);
    730   else if (kw == "imag")  mObjMgr->DisplayImage(tokens[0], opt, false);
    731   else if (kw == "imagnav")  mObjMgr->DisplayImage(tokens[0], opt, true);
    732   }
    733 
    734 else if (kw == "nt2d") {
    735   if (tokens.size() < 3) {
    736     cout << "Usage: nt2d nameobj varx vary [errx erry wt label opt]" << endl;
    737     return(0);
    738   }
    739   while (tokens.size() < 8) tokens.push_back("");
    740   string ph = "";
    741   mObjMgr->DisplayNT(tokens[0], tokens[1], tokens[2], ph, tokens[3], tokens[4], ph,
    742                      tokens[5], tokens[6], tokens[7], false);
    743   }
    744 else if (kw == "nt3d") {
    745   if (tokens.size() < 7) {
    746     cout << "Usage: nt3d nameobj varx vary varz [errx erry errz wt label opt]" << endl;
    747     return(0);
    748   }
    749   while (tokens.size() < 10) tokens.push_back("");
    750   mObjMgr->DisplayNT(tokens[0], tokens[1], tokens[2], tokens[3], tokens[4], tokens[5],
    751                      tokens[6], tokens[7], tokens[8], tokens[9], true);
    752   }
    753 else if (kw == "vecplot") {
    754   if (tokens.size() < 2) {
    755     cout << "Usage: vecplot nameVecX nameVecY [opt]" << endl;
    756     return(0);
    757   }
    758   while (tokens.size() < 3) tokens.push_back("");
    759   mObjMgr->DisplayVector(tokens[0], tokens[1], tokens[2]);
    760 }
    761 else if (kw == "bargraph") {
    762   if (tokens.size() < 2) {
    763     cout << "Usage: bargraph gr_opt v1 [v2 ...]" << endl;
    764     return(0);
    765   }
    766   PIBarGraph* bgd = new PIBarGraph;
    767   for(int k=1; k<tokens.size(); k++)
    768     bgd->AddBar(atof(tokens[k].c_str()));
    769   string grname = "BarGraph";
    770   mImgApp->DispScDrawer(bgd, grname, tokens[0]);
    771 }
    772 else if (kw == "textdrawer") {
    773   if (tokens.size() < 2) {
    774     cout << "Usage: textdrawer gr_opt line1 [line2 ...]" << endl;
    775     return(0);
    776   }
    777   PITextDrawer* txd = new PITextDrawer;
    778   for(int k=1; k<tokens.size(); k++)
    779     txd->AddLine(tokens[k]);
    780   string grname = "TextDrawer";
    781   tokens[0] += " inset";
    782   mImgApp->DispScDrawer(txd, grname, tokens[0]);
    783 }
    784 
    785 // Obsolete : ne pas virer SVP, cmv 26/7/99
    786 else if (kw == "gfd2d") {
    787   cout<<"----- gfd2d OBSOLETE: utilisez nt2d -----"<<endl;
    788   if(tokens.size()<2)
    789     {cout<<"Usage: gfd2d nomobj numvarx erreur=(x y xy) opt"<<endl;
    790      return(0);}
    791   string numvary = "";
    792   string err = "";
    793   string opt = "next";
    794   if(tokens.size()>2) err = tokens[2];
    795   if(tokens.size()>3) opt = tokens[3];
    796   mObjMgr->DisplayGFD(tokens[0],tokens[1],numvary,err,opt);
    797   }
    798 else if (kw == "gfd3d") {
    799   cout<<"----- gfd3d OBSOLETE: utilisez nt3d -----"<<endl;
    800   if(tokens.size()<3)
    801     {cout<<"Usage: gfd3d nameobj numvarx numvary erreur=(x y z xy xz yz xyz) opt"<<endl;
    802      return(0);}
    803   string err = "";
    804   string opt = "next";
    805   if(tokens.size()>3) err = tokens[3];
    806   if(tokens.size()>4) opt = tokens[4];
    807   mObjMgr->DisplayGFD(tokens[0],tokens[1],tokens[2],err,opt);
    808   }
    809 
    810494// >>>>>>>>>>>  Trace de fonctions
    811495else if ( (kw == "func") ) {
    … …  
    1141825}
    1142826
    1143 // Fonction pour enregistrer le Help des Widgets et Windows de piapp
    1144 static void RegisterPIGraphicsHelp(PIACmd* piac);
    1145827
    1146828/* --Methode-- */
    … …  
    1148830{
    1149831string kw, usage, grp;
     832//--------- Commandes du groupe modules externes
    1150833grp = "External Modules";
    1151834string gdesc = "Dynamic load (shared object modules) management command group";
    … …  
    1171854mpiac->RegisterCommand(kw, usage, this, grp);
    1172855
    1173 grp = "Graphics";
    1174 gdesc = "Basic graphics and object display commands";
    1175 mpiac->AddHelpGroup(grp, gdesc);
    1176 kw = "zone";
    1177 usage = "To Divide the Graphic window \n  Usage: zone [nx=1 ny=1]";
    1178 usage += "\n  Related commands: newwin"; 
    1179 mpiac->RegisterCommand(kw, usage, this, grp);
    1180 kw = "newwin";
    1181 usage = "To Create a New Graphic window, with zones \n";
    1182 usage += "  Window size can be specified \n";
    1183 usage += "    Usage: newwin [nx ny [sizeX sizeY]] ";
    1184 usage += "\n  Related commands: zone"; 
    1185 mpiac->RegisterCommand(kw, usage, this, grp);
    1186 kw = "stacknext";
    1187 usage = "Displays the next widget on stack window \n  Usage: stacknext";
    1188 mpiac->RegisterCommand(kw, usage, this, grp);
    1189 
    1190 kw = "graphicatt";
    1191 usage = "To change default graphic options\n  Usage: graphicatt att_list\n";
    1192 usage += "att_list=def back to default values, Example: gratt 'red circlemarker5'";
    1193 usage += "\n ------------------ Graphic attribute list ------------------\n";
    1194 usage += ">> Colors: defcol black white grey red blue green yellow\n";
    1195 usage += "           magenta cyan turquoise navyblue orange siennared purple\n";
    1196 usage += "           limegreen gold violet violetred blueviolet darkviolet\n";
    1197 usage += "   or \"color=name\" \"fgcolor=name\" \"bgcolor=name\" ex: \"color=red\"\n";
    1198 usage += ">> Lines: defline normalline thinline thickline dashedline thindashedline\n";
    1199 usage += "          thickdashedline dottedline thindottedline thickdottedline\n";
    1200 usage += "   or \"line=type,width\"   ex: \"line=dotted,7\"\n";
    1201 usage += ">> Fonts:\n";
    1202 usage += "   > Att: deffontatt normalfont boldfont italicfont bolditalicfont \n";
    1203 usage += "           smallfont smallboldfont smallitalicfont smallbolditalicfont\n";
    1204 usage += "           bigfont bigboldfont bigitalicfont bigbolditalicfont\n";
    1205 usage += "           hugefont  hugeboldfont hugeitalicfont hugebolditalicfont\n";
    1206 usage += "   > Names: deffont courierfont helveticafont timesfont symbolfont \n";
    1207 usage += "   or \"font=name,type,size\"   ex: \"font=courrier,bolditalic,10\"\n";
    1208 usage += ">> Marker: dotmarker<T>  plusmarker<T>  crossmarker<T> circlemarker<T>\n";
    1209 usage += "           fcirclemarker<T> boxmarker<T> fboxmarker<T> trianglemarker<T>\n";
    1210 usage += "           ftrianglemarker<T>  starmarker<T>  fstarmarker<T>\n";
    1211 usage += "       with <T> = 1 3 5 7 .. 15 , Example fboxmarker5 , plusmarker9 ...\n";
    1212 usage += "   or \"marker=type,size\"   ex: \"marker=plus,10\"\n";
    1213 usage += ">> ArrowMarker: basicarrow<T>  trianglearrow<T>  ftrianglearrow<T>\n";
    1214 usage += "                arrowshapedarrow<T> farrowshapedarrow<T>\n";
    1215 usage += "       with <T> = 5 7 .. 15 , Example trianglearrow7 ...\n";
    1216 usage += "   or \"arrow=type,size\"   ex: \"arrow=arrowshaped,10\"\n";
    1217 usage += "------ Specific options for image displays:\n";
    1218 usage += ">> ColorTables: defcmap  grey32  invgrey32  colrj32  colbr32\n";
    1219 usage += "                grey128  invgrey128  colrj128  colbr128\n";
    1220 usage += "                red32cm  green32cm  blue32cm  yellow32cm\n";
    1221 usage += "                orange32cm cyan32cm violet32cm\n";
    1222 usage += "                midas_pastel midas_heat midas_rainbow3 midas_bluered\n";
    1223 usage += "                midas_bluewhite midas_redwhite\n";
    1224 usage += "                multicol16 multicol64\n";
    1225 usage += ">> revcmap : reverse colorMap\n";
    1226 usage += ">> ZoomFactors :  zoomxN   ex: zoomx1 zoomx2 zoomx3 ...\n";
    1227 usage += "                  zoom/N   ex: zoom/2 zoom/3 zoom/4 ...\n";
    1228 usage += ">> imagecenter=ix,iy : Position the image in widget\n";
    1229 usage += ">> lut=ltyp,min,max : Sets LUT type and min/max\n";
    1230 usage += "                      (ltyp=lin/log/sqrt/square)\n";
    1231 usage += ">> invx,invy,exchxy : image axes configuration\n";
    1232 usage += ">> for Axes / Axe labels / LogScale / xylimits / defdrrect\n";
    1233 usage += "       see setaxesatt command\n";
    1234 usage += "--- General purpose options:\n";
    1235 usage += ">> stat,stats / nsta,nstat,nostat,nostats : Toggle statistic display\n";
    1236 usage += ">> title,tit / notitle,notit -> Toggle automatic title display\n";
    1237 usage += ">> Choose display window: next same win stack inset\n";
    1238 usage += "\n"; 
    1239 usage += "   Related commands: setaxesatt setinsetlimits "; 
    1240 mpiac->RegisterCommand(kw, usage, this, grp);
    1241 
    1242 kw = "setaxesatt";
    1243 usage = "To set default axes attributes \n  Usage: setaxesatt att_list \n";
    1244 usage += "Color/Line/Font attributes and axes attributes \n";
    1245 usage += ">> Axes: axesnone stdaxes=defaxes=boxaxes boxaxesgrid \n";
    1246 usage += "         fineaxes fineaxesgrid centeredaxes finecenteredaxes \n";
    1247 usage += "         centeredaxesgrid finecenteredaxesgrid\n";
    1248 usage += "         axescenter=x0,y0 (only with centered axes, default \"axescenter=\")\n";
    1249 usage += "         grid nogrid labels nolabels  \n";
    1250 usage += "         ticks noticks minorticks nominorticks \n";
    1251 usage += "         extticks intticks extintticks \n";
    1252 usage += "         nbticks=X_NTicks,Y_NTicks  \n";
    1253 usage += "         tickslen=MajTickLenFrac,MinTickLenFrac \n";
    1254 usage += ">> Axe labels font size: fixedfontsize/autofontsize=fszf \n";
    1255 usage += "         autofontsize=fsizef: Font size computed automatically \n";
    1256 usage += "         fixedfontsize: Use font size attribute (BaseDrawer) \n";
    1257 usage += ">> Scale type: linx liny logx logy -> Lin/Log Scales for 2D plots \n";
    1258 usage += ">> xylimits=xmin,xmax,ymin,ymax  -> Forces X-Y limits in 2-D plots \n";
    1259 usage += ">> defdrrect=xmin,xmax,ymin,ymax -> Defines drawing rectangle 2-D plots \n";
    1260 usage += "          The rectangle is defined as a fraction of the widget size\n";
    1261 mpiac->RegisterCommand(kw, usage, this, grp);
    1262 
    1263 kw = "setinsetlimits";
    1264 usage = "Define the display rectangle for drawers added as insets \n";
    1265 usage += " over existing graphic objects - limits expressed as fraction \n"; 
    1266 usage += " graphic object size (0. .. 1.) Xmax at right, YMax top. ";
    1267 usage += " Usage: setinsetlimits xmin xmax ymin ymax";
    1268 usage += "\n  Related commands: graphicatt /inset"; 
    1269 mpiac->RegisterCommand(kw, usage, this, grp);
    1270 
    1271 kw = "drpanel";
    1272 usage = "Creates a new 2D drawing zone for addtext, addline \n";
    1273 usage += " Usage: drpanel xmin xmax ymin ymax [GrAtt] [Name]";
    1274 usage += "\n  Related commands: addtext addline addrect addcirc ..."; 
    1275 mpiac->RegisterCommand(kw, usage, this, grp);
    1276 
    1277 kw = "addtext";
    1278 usage = "Adds a text string to the current graphic object";
    1279 usage += "\n at the specified position (+ color/font/pos/dir attributes) ";
    1280 usage += "\n The Base/AxesDrawer is used to handle added text strings" ;
    1281 usage += "\n Alt<E> to remove the added element";
    1282 usage += "\n  Usage: addtext x y TextString [ColFontPosAtt] [fgnc=false/true]";
    1283 usage += "\n  (use quotes '' for multi word text strings) ";
    1284 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1285 usage += "\n Text position/direction attribute: ";
    1286 usage += "\n      horizleft horizcenter horizright";
    1287 usage += "\n      vertbottom vertcenter verttop ";
    1288 usage += "\n      textdirhoriz textdirvertup textdirvertdown ";
    1289 usage += "\n  Related commands: addctext addline addarrow addrect addfrect";
    1290 usage += "\n      addcirc addfcirc addarc addfrac addpoly addfpoly settitle graphicatt"; 
    1291 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1292 
    1293 kw = "addctext";
    1294 usage = "Adds a composite text string with superscript and subscripts ";
    1295 usage += "\n at the specified position (+ color/font/pos/dir attributes) ";
    1296 usage += "\n  Usage: addctext x y Text sUp sDown [ColFontPosAtt] [UpDownFontAtt] [fgnc]";
    1297 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1298 usage += "\n  Related commands: addtext addline addrect ...";
    1299 usage += "\n      (See command addtext and graphicatt for more details)"; 
    1300 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1301 
    1302 kw = "addline";
    1303 usage = "Adds a line to the current graphic object";
    1304 usage += "\n at the specified position (+ graphic attribute)";
    1305 usage += "\n The Base/AxesDrawer is used to handle added lines";
    1306 usage += "\n Alt<E> to remove the added element";
    1307 usage += "\n  Usage: addline x1 y1 x2 y2 [GraphicAtt] [fgnc=false/true]";
    1308 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1309 usage += "\n  Related commands: addarrow addtext addrect addfrect ";
    1310 usage += "\n       addmarker addcirc addfcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1311 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1312 
    1313 kw = "addarrow";
    1314 usage = "Adds an arrow to the current graphic object";
    1315 usage += "\n at the specified position (+ graphic attribute)";
    1316 usage += "\n The Base/AxesDrawer is used to handle added lines";
    1317 usage += "\n Alt<E> to remove the added element";
    1318 usage += "\n  Usage: addarrow x1 y1 x2 y2 [GraphicAtt] [fgnc=false/true]";
    1319 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1320 usage += "\n  Related commands: addline addtext addrect addfrect ";
    1321 usage += "\n       addmarker addcirc addfcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1322 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1323 kw = "addarrow_nc";
    1324 
    1325 kw = "addrect";
    1326 usage = "Adds a rectangle to the current graphic object";
    1327 usage += "\n between the specified positions (+ graphic attribute)";
    1328 usage += "\n The Base/AxesDrawer is used to handle added rectangle";
    1329 usage += "\n Alt<E> to remove added element";
    1330 usage += "\n  Usage: addrect x1 y1 x2 y2 [GraphicAtt] [fgnc=false/true]";
    1331 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1332 usage += "\n  Related commands: addtext addline addarrow addfrect";
    1333 usage += "\n       addcirc addfcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1334 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1335 
    1336 kw = "addfrect";
    1337 usage = "Adds a filled rectangle to the current graphic object";
    1338 usage += "\n between the specified positions (+ graphic attribute)";
    1339 usage += "\n The Base/AxesDrawer is used to handle added rectangle";
    1340 usage += "\n Alt<E> to remove added element";
    1341 usage += "\n  Usage: addfrect x1 y1 x2 y2 [GraphicAtt] [fgnc=false/true]";
    1342 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1343 usage += "\n  Related commands: addtext addline addarrow addrect";
    1344 usage += "\n       addcirc addfcirc addpoly addfpoly graphicatt"; 
    1345 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1346 
    1347 kw = "addmarker";
    1348 usage = "Adds a marker to the current graphic object";
    1349 usage += "\n at the specified position (+ graphic attribute)";
    1350 usage += "\n The Base/AxesDrawer is used to handle added circles";
    1351 usage += "\n Alt<E> to remove added element";
    1352 usage += "\n  Usage: addmarker xpos ypos [GraphicAtt] [fgnc=false/true]";
    1353 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1354 usage += "\n  Related commands: addtext addline addarrow addfrect addfrect";
    1355 usage += "\n       addcirc addfcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1356 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1357 
    1358 kw = "addcirc";
    1359 usage = "Adds a circle to the current graphic object";
    1360 usage += "\n with the specified center and radius (+ graphic attribute)";
    1361 usage += "\n The Base/AxesDrawer is used to handle added circles";
    1362 usage += "\n Alt<E> to remove added element";
    1363 usage += "\n  Usage: addcirc xcenter ycenter radius [GraphicAtt] [fgnc=false/true]";
    1364 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1365 usage += "\n  Related commands: addtext addline addarrow addfrect addfrect";
    1366 usage += "\n       addfcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1367 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1368 
    1369 kw = "addfcirc";
    1370 usage = "Adds a filled circle to the current graphic object";
    1371 usage += "\n with the specified center and radius (+ graphic attribute)";
    1372 usage += "\n The Base/AxesDrawer is used to handle added circles";
    1373 usage += "\n Alt<E> to remove added element";
    1374 usage += "\n  Usage: addcirc xcenter ycenter radius [GraphicAtt] [fgnc=false/true]";
    1375 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1376 usage += "\n  Related commands: addtext addline addarrow addfrect addfrect";
    1377 usage += "\n       addcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1378 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1379 
    1380 kw = "addoval";
    1381 usage = "Adds an oval (ellipse) to the current graphic object";
    1382 usage += "\n centered on xc,yc - semi-axis ds,dy (+ graphic attribute)";
    1383 usage += "\n The Base/AxesDrawer is used to handle added rectangle";
    1384 usage += "\n Alt<E> to remove added element";
    1385 usage += "\n  Usage: addoval xc yc dx dy [GraphicAtt] [fgnc=false/true]";
    1386 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1387 usage += "\n  Related commands: addfoval addline addarrow addfrect addcirc addfcirc";
    1388 usage += "\n       addcirc addfcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1389 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1390 
    1391 kw = "addfoval";
    1392 usage = "Adds a filled oval (ellipse) to the current graphic object";
    1393 usage += "\n centered on xc,yc - semi-axis ds,dy (+ graphic attribute)";
    1394 usage += "\n The Base/AxesDrawer is used to handle added rectangle";
    1395 usage += "\n Alt<E> to remove added element";
    1396 usage += "\n  Usage: addfoval xc yc dx dy [GraphicAtt] [fgnc=false/true]";
    1397 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1398 usage += "\n  Related commands: addoval addline addarrow addfrect addcirc addfcirc";
    1399 usage += "\n       addcirc addfcirc addarc addfarc addpoly addfpoly graphicatt"; 
    1400 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1401 
    1402 kw = "addarca";
    1403 usage = "Adds an arc to the current graphic object";
    1404 usage += "\n defined by the circle (center+radius), start angle and angular extension";
    1405 usage += "\n Angles are specified in degrees";
    1406 usage += "\n  Usage: addarca xc yc r a0deg dadeg [GraphicAtt] [fgnc=false/true]";
    1407 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1408 usage += "\n  Related commands: addtext addline addfarca addarc ...";
    1409 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1410 
    1411 kw = "addfarca";
    1412 usage = "Adds a filled arc to the current graphic object";
    1413 usage += "\n defined by the circle (center+radius), start angle and angular extension";
    1414 usage += "\n Angles are specified in degrees";
    1415 usage += "\n  Usage: addfarca xc yc r a0deg dadeg [GraphicAtt] [fgnc=false/true]";
    1416 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1417 usage += "\n  Related commands: addtext addline addarca addarc ...";
    1418 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1419 
    1420 kw = "addarc";
    1421 usage = "Adds an arc to the current graphic object";
    1422 usage += "\n defined by 3 points (+ graphic attribute)";
    1423 usage += "\n The Base/AxesDrawer is used to handle added arcs";
    1424 usage += "\n Alt<E> to remove the added element";
    1425 usage += "\n  Usage: addarc x1 y1 x2 y2 x3 y3 [GraphicAtt] [fgnc=false/true]";
    1426 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1427 usage += "\n  Related commands: addtext addline addarrow addfrect addfrect";
    1428 usage += "\n       addcirc addfcirc addfarc addarca addpoly addfpoly graphicatt"; 
    1429 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1430 
    1431 kw = "addfarc";
    1432 usage = "Adds a filled arc to the current graphic object";
    1433 usage += "\n defined by 3 points (+ graphic attribute)";
    1434 usage += "\n The Base/AxesDrawer is used to handle added arcs";
    1435 usage += "\n Alt<E> to remove added element";
    1436 usage += "\n  Usage: addarc x1 y1 x2 y2 x3 y3 [GraphicAtt] [fgnc=false/true]";
    1437 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1438 usage += "\n  Related commands: addtext addline addarrow addfrect addfrect";
    1439 usage += "\n       addcirc addfcirc addfarc addpoly addfpoly graphicatt"; 
    1440 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1441 
    1442 kw = "addpoly";
    1443 usage = "Adds a polyline/polygon to the current graphic object";
    1444 usage += "\n  Usage: addploy 'x1,y1 x2,y2 x3,y3 ...' [GraphicAtt] [fgnc=false/true]";
    1445 usage += "\n  Coordinates specified as pairs x,y in a single word (use simple or double quotes";
    1446 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1447 usage += "\n  Related commands: addtext addline addarrow addfrect addfrect";
    1448 usage += "\n       addcirc addfcirc addfarc  graphicatt"; 
    1449 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1450 
    1451 kw = "addfpoly";
    1452 usage = "Adds a filled polygon to the current graphic object";
    1453 usage += "\n  Usage: addploy 'x1,y1 x2,y2 x3,y3 ...' [GraphicAtt] [fgnc=false/true]";
    1454 usage += "\n  Coordinates specified as pairs x,y in a single word (use simple or double quotes";
    1455 usage += "\n  if fgnc==true : Normalized 0..1 coordinates specification (def=false)";
    1456 usage += "\n  Related commands: addtext addline addarrow addfrect addfrect";
    1457 usage += "\n       addcirc addfcirc addfarc  graphicatt"; 
    1458 mpiac->RegisterCommand(kw, usage, this, "Graphic-Elts");
    1459 
    1460 kw = "settitle";
    1461 usage = "Set the title string (top title / bottom title) for the current graphic object";
    1462 usage += "\n  Usage: settitle TopTitle [BottomTitle] [fontAtt]";
    1463 usage += "\n  Related commands: addtext graphicatt"; 
    1464 mpiac->RegisterCommand(kw, usage, this, grp);
    1465 
    1466 kw = "addtitle";
    1467 usage = "Set the title string (top title / bottom title) \n";
    1468 usage += "   alias for settitle ";
    1469 mpiac->RegisterCommand(kw, usage, this, grp);
    1470 
    1471 kw = "setaxelabels";
    1472 usage = "Set the X and Y axis labels for the current 2D graphic object \n";
    1473 usage += "\n  Usage: setaxelabels xLabel yLabel [ColorFntAtt]";
    1474 usage += "\n  Related commands: settitle addtext graphicatt"; 
    1475 mpiac->RegisterCommand(kw, usage, this, grp);
    1476 
    1477 kw = "addaxelabels";
    1478 usage = "Set the X and Y axis labels for the current 2D graphic object";
    1479 usage += "   alias for setaxelabels ";
    1480 mpiac->RegisterCommand(kw, usage, this, grp);
    1481 
    1482 RegisterPIGraphicsHelp(mpiac);
    1483 
     856//------- Commandes FileIO
    1484857kw = "openfits";
    1485858usage = "Loads a FITS file into an appropriate object \n Usage: openfits filename";
    … …  
    1542915mpiac->RegisterCommand(kw, usage, this, "FileIO");
    1543916
     917//------- Commandes gestion de repertoires et d'objets
    1544918kw = "mkdir";
    1545919usage = "Create a directory";
    … …  
    1605979mpiac->RegisterCommand(kw, usage, this, "Object Management");
    1606980
     981//------- Commandes creation/manipulation d'objets
    1607982kw = "newh1d";
    1608983usage = "Creates a 1D histogramm \n Usage: newh1d name xmin xmax nbin";
    … …  
    16671042mpiac->RegisterCommand(kw, usage, this, "Objects");
    16681043
    1669 kw = "disp";
    1670 usage = "Displays an object \n Usage: disp nameobj [graphic_attributes]";
    1671 usage += "\n  Related commands: surf nt2d nt3d vecplot"; 
    1672 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1673 kw = "imag";
    1674 usage = "Displays an object as an image \n Usage: imag nameobj [graphic_attributes]";
    1675 usage += "\n  Related commands: disp imagnav surf nt2d nt3d vecplot"; 
    1676 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1677 kw = "imagnav";
    1678 usage = "Displays an object as an image with the ImageNavigator viewer \n";
    1679 usage += "Usage: imagnav nameobj [graphic_attributes]";
    1680 usage += "\n  Related commands: disp imag surf nt2d nt3d vecplot"; 
    1681 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1682 kw = "surf";
    1683 usage = "Displays an object as a 3D surface \n Usage: surf nameobj [graphic_attributes]";
    1684 usage += "\n  Related commands: disp nt2d nt3d vecplot"; 
    1685 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1686 kw = "nt2d";
    1687 usage = "Displays Points (X-Y) [with error-bar / Weight / Label ] from an NTuple ";
    1688 usage += "\n Usage : nt2d nameobj varx vary [errx erry wt label graphic_attributes]";
    1689 usage += "\n  Related commands: disp  surf  nt3d  gfd2d vecplot"; 
    1690 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1691 kw = "nt3d";
    1692 usage = "Displays 3D-Points (X-Y-Z) [with error-bars / Weight / Label ] from an NTuple ";
    1693 usage += "\n Usage : nt3d nameobj varx vary varz [errx erry errz wt label graphic_attributes]";
    1694 usage += "\n  Related commands: disp  surf  nt2d gfd3d "; 
    1695 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1696 kw = "vecplot";
    1697 usage = "Displays Points (X-Y) with coordinates defined by two vectors ";
    1698 usage += "\n Usage : vecplot nameVecX nameVecY [graphic_attributes]";
    1699 usage += "\n  Related commands: disp nt2d "; 
    1700 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1701 kw = "bargraph";
    1702 usage = "Bar-Graph view of a sequence of values (test)";
    1703 usage += "\n Usage : bargraph graphic_attributes v1 [v2 v3 ...] ";
    1704 usage += "\n  Related commands: disp nt2d vecplot"; 
    1705 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1706 kw = "textdrawer";
    1707 usage = "Multi line text darwer (test)";
    1708 usage += "\n Usage : textdrawer graphic_attributes line1 [line2 line3 ...] ";
    1709 usage += "\n  Related commands: disp "; 
    1710 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1711 
    1712 // Ceci est maintenant obsolete, on garde pour info.
    1713 kw = "gfd2d";
    1714 usage = "Displays Points (X-Y) with error-bars from a GeneralFit Data ";
    1715 usage += "\n Usage : gfd2d nameobj numvarx erreur=(x y xy) [graphic_attributes]";
    1716 usage += "\n  Related commands: gfd3d nt2d nt3d ";
    1717 usage += "\n  ----- OBSOLETE: utilisez nt2d -----";
    1718 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1719 kw = "gfd3d";
    1720 usage = "Displays 3D-Points (X-Y-Z) with error-bars from a GeneralFit Data ";
    1721 usage += "\n Usage : gfd3d nameobj numvarx numvary erreur=(x y z xy xz yz xyz) [graphic_attributes]";
    1722 usage += "\n  Related commands: gfd2d nt2d nt3d "; 
    1723 usage += "\n  ----- OBSOLETE: utilisez nt3d -----";
    1724 mpiac->RegisterCommand(kw, usage, this, "Obj. Display");
    1725 
     1044//------- Commandes trace de fonctions
    17261045kw = "func";
    17271046usage = "Displays a function y=f(x) (Fills a vector with function values)";
    … …  
    17451064mpiac->RegisterCommand(kw, usage, this, "Func Plot");
    17461065
     1066//------ Commandes trace d'expression
    17471067kw = "ObjectExpressions";
    17481068usage = "Any mathematical expression (math.h) with object variables can be used";
    … …  
    19761296}
    19771297
    1978 /* Nouvelle-Fonction */
    1979 void RegisterPIGraphicsHelp(PIACmd* piac)
    1980 {
    1981 string kw,grp,usage;
    1982 
    1983 grp = "Graphics";
    1984 
    1985 kw = "PIImage";
    1986 usage = "Manages the display of a 2-D array (P2DArrayAdapter) as an image \n";
    1987 usage += "and controls a zoom widget, as well as a global image view widget \n";
    1988 usage += ">>>> Mouse controls : \n";
    1989 usage += "o Button-1: Display current coordinates and pixel value\n";
    1990 usage += "  Position the cursor an refresh the zoom widget\n";
    1991 usage += "o Button-2: Defines an image zone and positions the cursor \n";
    1992 usage += "o Button-3: Moves the viewed portion of the array inside the window \n";
    1993 usage += ">>>> Keyboard controls : \n";
    1994 usage += "o <Alt>R : Refresh display \n";
    1995 usage += "o <Alt>O : Shows the PIImageTools (image display parameter controls) \n";
    1996 usage += "o <Alt>G : Show the PIDrawerTools (Graphic attributes of overlayed graphics (Drawers)) \n";
    1997 usage += "o <Alt>D : Shows the drawer manipulation pop-up menu \n";
    1998 usage += "o <Alt>V : Copy/Paste / Text paste at the current cursor position \n";
    1999 usage += "o <Alt>C : Copy/Paste / Copies the selected regions content as text in the copy/paste buffer \n";
    2000 usage += "o <Alt>X : Show/Hide the Cut Window \n";
    2001 usage += "o <Alt>Z : Removes added graphic elements (handled by BaseDrawer - 0) \n";
    2002 usage += "o <Alt>E : Removes the last added graphic element \n";
    2003 usage += "o <Alt>+ or <Cntl>+ : Zoom in \n";
    2004 usage += "o <Alt>- or <Cntl>- : Zoom out \n";
    2005 usage += "o Cursor keys : Moves the image cursor \n";
    2006 piac->RegisterHelp(kw, usage, grp);
    2007 
    2008 kw = "PIScDrawWdg";
    2009 usage = "Manages display of 2-D drawers with interactive zoom \n";
    2010 usage += ">>>> Mouse controls : \n";
    2011 usage += "o Button-1: Display current coordinates \n";
    2012 usage += "o Button-2: Defines a rectangle for zoom \n";
    2013 usage += "o Button-3: Defines a rectangle for Text-Info (<Alt>I) \n";
    2014 usage += ">>>> Keyboard controls : \n";
    2015 usage += "o <Alt>R : Refresh display \n";
    2016 usage += "o <Alt>O : Displays a specific control window (default: PIDrawerTools) \n";
    2017 usage += "           (2-D histograms, contour plot ...) \n";
    2018 usage += "o <Alt>G : Show the PIDrawerTools (Graphic attributes of displayed Drawers) \n";
    2019 usage += "           Drawer 0 manages the axes, as well as the added text \n";
    2020 usage += "o <Alt>D : Shows the drawer manipulation pop-up menu \n";
    2021 usage += "o <Alt>V : Copy/Paste / Text paste at the current position \n";
    2022 usage += "o <Alt>Z : Removes added graphic elements (handled by BaseDrawer - 0) \n";
    2023 usage += "o <Alt>E : Removes the last added graphic element \n";
    2024 usage += "o <Alt>I : Shows (or updates) a text info window on the selected rectangle \n";
    2025 usage += "o <Alt>M : Activate/Deactivate a measurement cursor on Button-1\n";
    2026 usage += "o <Alt>L : Deactivate DX,DY print (see below)\n";
    2027 usage += ">>>> Mouse + Keyboard controls : \n";
    2028 usage += "o Button-1 + <Alt>K : Set (reset) the reference point for DX,DY print \n";
    2029 piac->RegisterHelp(kw, usage, grp);
    2030 
    2031 kw = "PIDraw3DWdg";
    2032 usage = "Manages display of 3-D objects (drawers)  \n";
    2033 usage += ">>>> Mouse controls : \n";
    2034 usage += "o Button-2: Rotates the observer (camera) around object \n";
    2035 usage += "o Shift-Button-2: Rotates object with camera fixed \n";
    2036 usage += "  The object rotation mode can be assigned to Button-2 with <Alt>S \n";
    2037 usage += "o Button-3: Zoom control (Camera distance And/Or view angle) \n";
    2038 usage += ">>>> Keyboard controls : \n";
    2039 usage += "o <Alt>R : Resets the 3-D view and refreshes the display \n";
    2040 usage += "o <Alt>O : Displays a specific control window (default: PIDrawerTools) \n";
    2041 usage += "           (2-D histograms, contour plot ...) \n";
    2042 usage += "o <Alt>G : Show the PIDrawerTools (Graphic attributes of displayed Drawers) \n";
    2043 usage += "           Drawer 0 manages the axes, as well as the added text \n";
    2044 usage += "o <Alt>D : Shows the drawer manipulation pop-up menu \n";
    2045 usage += "o <Alt>V : Copy/Paste / Text paste at the current position (Drawer 0)\n";
    2046 usage += "o <Alt>Z : Removes added graphic elements (handled by BaseDrawer - 0) \n";
    2047 usage += "o <Alt>E : Removes the last added graphic element \n";
    2048 usage += "o <Alt>A : Activate/Deactivate axes drawing \n";
    2049 usage += "o <Alt>S : Activate/Deactivate object rotation mode on Button-2 \n";
    2050 piac->RegisterHelp(kw, usage, grp);
    2051 
    2052 kw = "Windows";
    2053 usage = "Objects can be displayed in different windows, or overlayed on the \n";
    2054 usage += "previous display. The graphics attributes next,win,stack,same control \n";
    2055 usage += "the display window. \n";
    2056 usage += "o GraphicWindow : This is the default mode (gr_att=next)\n";
    2057 usage += "  Graphic windows can be divided int zones. Object is displayed \n";
    2058 usage += "  in the next available position, removing a previously displayed \n";
    2059 usage += "  widget if necessary \n";
    2060 usage += "o Window : An object is displayed in its own window (gr_att= win) \n";
    2061 usage += "o StackWindow : multpile widgets can be stacked in a StackWindow (gr_att= stack) \n";
    2062 usage += "  A single widget is displayed a any time. Different widgets in a StackWindow \n";
    2063 usage += "  can be displayed using the stacknext command, as well as the StackTools item \n";
    2064 usage += "  in the Tools menu (from Menubar). An automatic cyclic display mode can also \n";
    2065 usage += "  be activated using the StackTools menu (Blink) \n";
    2066 usage += "o Most objects can be also be displayed overlayed \n";
    2067 usage += "  on the last displayed widget (gr_att= same) \n";
    2068 usage += "o The overlay can be on a selected rectangle of the \n"; 
    2069 usage += "  last displayed widget (gr_att= inset) - See setinsetlimits\n";
    2070 usage += "\n  Related commands: newwin zone stacknext graphicatt setinsetlimits"; 
    2071 piac->RegisterHelp(kw, usage, grp);
    2072 
    2073 kw = "PIConsole";
    2074 usage = "Text output area and command editing window (console) \n";
    2075 usage += ">>>> Mouse controls : \n";
    2076 usage += "o Button-1: Rectangle selection for copy/paste \n";
    2077 usage += "o Button-2: Paste text in the command editing line \n";
    2078 usage += "o Button-3: activate display option menu \n";
    2079 usage += ">>>> Keyboard controls : \n";
    2080 usage += "o <Alt>O : activate display option menu   \n";
    2081 usage += "o <Alt>V : Paste text in the command editing line \n";
    2082 usage += "o <Alt>A : Selection of the whole window for copy \n";
    2083 usage += "o <Alt>L : Command history (List of command history buffer) \n";
    2084 usage += "o <Ctl>A : Command editing -> Goto the beginning of line \n";
    2085 usage += "o <Ctl>E : Command editing -> Goto the end of line \n";
    2086 usage += "o <Ctl>K : Command editing -> Clear to the end of line \n";
    2087 usage += "o <Ctl>C : Command editing -> Clear the line \n";
    2088 usage += "o Cursor left,right : Command editing -> Move cursor \n";
    2089 usage += "o Cursor Up,Down : recall command from history buffer \n";
    2090 usage += "o Backspace,Del : Command editing \n";
    2091 usage += "o <Return>,<Enter> : Execute command \n";
    2092 piac->RegisterHelp(kw, usage, grp);
    2093 }

  • trunk/SophyaPI/PIext/objlist.list

    r2765 r2781  
    44cxxexecwin.o
    55flowmodex.o
     6graphexecut.o
    67nobjmgr.o
    78nomgadapter.o

  • trunk/SophyaPI/PIext/piacmd.cc

    r2755 r2781  
    66#include <math.h>
    77
    8 #include "basexecut.h"
    98
    109#include "pdlmgr.h"
    … …  
    2120#include "pistdimgapp.h"
    2221#include "nobjmgr.h"
     22
     23// Les differentes classes CommandExecutor
     24#include "basexecut.h"
     25#include "graphexecut.h"
    2326#include "piafitting.h"
    2427#include "pawexecut.h"
    … …  
    170173
    171174basexec = new PIABaseExecutor(this, mObjMgr, app);
     175graphexec = new PIAGraphicExecutor(this, mObjMgr, app);
    172176fitexec = new PIAFitter(this, app);
    173177pawexec = new PAWExecutor(this, app);
    … …  
    197201delete cxxoptwin;
    198202delete basexec;
     203delete graphexec;
    199204delete fitexec;
    200205delete pawexec;

  • trunk/SophyaPI/PIext/piacmd.h

    r2536 r2781  
    7272  PIStdImgApp* mImgApp;
    7373
    74   CmdExecutor* basexec;  // basic command executor
     74  CmdExecutor* basexec;  // base command executor
     75  CmdExecutor* graphexec; // graphic command executor
    7576  CmdExecutor* fitexec;  // Fit command executor
    7677  CmdExecutor* pawexec;  // paw-like command executor

  • trunk/SophyaPI/PIext/servnobjm.cc

    r2762 r2781  
    261261if (!mImgapp)  return;
    262262
    263 if (npx < 3) npx = 3;
    264 if (npy < 3) npy = 3;
    265 if (npx > 250) npx = 250;
    266 if (npy > 250) npy = 250;
     263if (npx < 2) npx = 2;
     264if (npy < 2) npy = 2;
     265//if (npx > 250) npx = 250;
     266//if (npy > 250) npy = 250;
    267267if (xmax <= xmin) xmax = xmin+1.;
    268268if (ymax <= ymin) ymax = ymin+1.;
    … …  
    310310    }
    311311  else titre = nom;
     312  int rsid = 0;
    312313  P2DArrayAdapter* arr = new POMatrixAdapter(mtx, false);
    313314  arr->DefineXYCoordinates(xmin, ymin, dx, dy);
    314   PISurfaceDrawer* sdr = new PISurfaceDrawer(arr, true, true, true);
    315   int rsid = mImgapp->Disp3DDrawer(sdr, titre, dopt);
     315  if ( (npx <= 200) && (npy <= 200) ) {
     316    PISurfaceDrawer* sdr = new PISurfaceDrawer(arr, true, true, true);
     317    rsid = mImgapp->Disp3DDrawer(sdr, titre, dopt);
     318  }
     319  else  rsid = mImgapp->DispImage(arr, titre, dopt);
     320
    316321  if (nom.length() > 0)  {
    317322    MyObjMgr()->AddObj(mtx, nom);
Note: See TracChangeset for help on using the changeset viewer.