ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/FastOpenGlDisplayer/src/Frog_Analyzer.cc
(Generate patch)

Comparing UserCode/FastOpenGlDisplayer/src/Frog_Analyzer.cc (file contents):
Revision 1.49 by querten, Fri Oct 24 08:03:55 2008 UTC vs.
Revision 1.52 by querten, Mon Nov 24 07:30:13 2008 UTC

# Line 155 | Line 155
155   #include "Visualisation/Frog/soft/Includes/FROG/FROG_ZLib.h"
156   #include "Visualisation/Frog/soft/Includes/FROG/FROG_ZLib.cpp"
157  
158 + #include "Visualisation/Frog/soft/Includes/FROG/FROG_Path.h"
159 + #include "Visualisation/Frog/soft/Includes/FROG/FROG_Path.cpp"
160 +
161 + #include "Visualisation/Frog/soft/Includes/FROG/FROG_Net_Tools.h"
162 + #include "Visualisation/Frog/soft/Includes/FROG/FROG_Net_Tools.cpp"
163  
164  
165   using namespace edm;
# Line 214 | Line 219 | class Frog_Analyzer : public edm::EDAnal
219        // ----------member data ---------------------------
220  
221        bool                  CompressFiles;
222 <
222 >      bool                  AddRunInfoInName;
223  
224        bool                  ProduceGeom;
225        int                   NEventsInVisFile;
226        int                   NEvents;
227 +      
228 +
229  
230 +      unsigned int          FileIndex;
231        unsigned int          SRun;
232        unsigned int          SEvent;
233 +
234   };
235  
236   //
# Line 268 | Line 277 | Frog_Analyzer::Frog_Analyzer(const edm::
277      ProduceGeom             = iConfig.getParameter<bool  >("ProduceGeom"       );
278      NEventsInVisFile        = iConfig.getParameter<int   >("NEventsInVisFile"  );
279      CompressFiles           = iConfig.getParameter<bool  >("CompressFiles"     );
280 +    AddRunInfoInName        = iConfig.getParameter<bool  >("AddRunInfoInName"  );
281  
282 <
283 <    NEvents = 0;
282 >    NEvents   = 0;
283 >    FileIndex = 0;
284   }
285  
286  
# Line 824 | Line 834 | Frog_Analyzer::endJob()
834     if(NEvents>0){
835        char OutputFileName[1024];
836        sprintf(OutputFileName,"%s",OutputFile.substr(0,OutputFile.size()-4).c_str());
837 <      if(NEventsInVisFile>=0)sprintf(OutputFileName,"%s_Run%i_1stEvent%08i",OutputFileName,SRun,SEvent);
837 >      if(NEventsInVisFile>=0){
838 >        sprintf(OutputFileName,"%s_%i",OutputFileName,FileIndex);
839 >        if(AddRunInfoInName)sprintf(OutputFileName,"%s_Run%i_1stEvent%08i",OutputFileName,SRun,SEvent);
840 >      }
841        sprintf(OutputFileName,"%s.vis",OutputFileName);
842  
843        events->SaveInLive((char*) OutputFileName, true, CompressFiles);
# Line 1425 | Line 1438 | Frog_Analyzer::analyze(const edm::Event&
1438  
1439     char OutputFileName[1024];
1440     sprintf(OutputFileName,"%s",OutputFile.substr(0,OutputFile.size()-4).c_str());
1441 <   if(NEventsInVisFile>0)sprintf(OutputFileName,"%s_Run%i_1stEvent%08i",OutputFileName,SRun,SEvent);
1441 >     if(NEventsInVisFile>=0){
1442 >     sprintf(OutputFileName,"%s_%i",OutputFileName,FileIndex);
1443 >     if(AddRunInfoInName)sprintf(OutputFileName,"%s_Run%i_1stEvent%08i",OutputFileName,SRun,SEvent);
1444 >   }
1445     sprintf(OutputFileName,"%s.vis",OutputFileName);
1446     events->SaveInLive((char*) OutputFileName, false, CompressFiles, (unsigned int)-1);
1447  
1448     if(NEvents == NEventsInVisFile){
1449        events->SaveInLive((char*) OutputFileName, true, CompressFiles, (unsigned int)-1);
1450 +      FileIndex++;
1451  
1452        delete events;
1453        events      = new FROG_Events();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines