hepmc - Diff between revs 371 and 376

Subversion Repositories:

(root)/branches/HEPMC_02_03_branch/test/testHepMC.cc.in

Rev 371 - Details - Blame - Last modification - View Log -

+	}
 	// clean up and get next event
 	delete evt;
 	ascii_in >> evt;
-    }
-    // print status of input stream
-    if ( ascii_in.error_type() != 0 ) {
-        std::cout << "processing of @srcdir@/testIOGenEvent.input ended with error "
-	          << ascii_in.error_type() << std::endl;
-        std::cout << "  --- " << ascii_in.error_message() << std::endl;
+    }
     //........................................PRINT RESULT
     std::cout << num_good_events << " out of " << icount
 	      << " processed events passed the cuts. Finished." << std::endl;
+}
 	              << std::endl;
 	    return;
+	}
 	//........................................EVENT LOOP
 	int icount=0;
-	int invaliddata=0;
-	bool ok = true;
 	HepMC::GenEvent* evt = ascii_in.read_next_event();
-	while ( ok ) {
-	    if( evt ) {
-		icount++;
-		if ( icount%50==1 ) std::cout << "Processing Event Number " << icount
-					      << " its # " << evt->event_number()
-					      << std::endl;
-		ascii_out << evt;
+	while ( evt ) {
+	    icount++;
+	    if ( icount%50==1 ) std::cout << "Processing Event Number " << icount
+					  << " its # " << evt->event_number()
+					  << std::endl;
+	    ascii_out << evt;
-		// clean up and get next event
-		delete evt;
-		ascii_in >> evt;
-	    } else if (ascii_in.error_type() == HepMC::IO_Exception::InvalidData ) {
-	        ++invaliddata;
-                std::cerr << "INPUT ERROR: " << ascii_in.error_message() << std::endl;
-		// clean up and get next event
-		delete evt;
-		ascii_in >> evt;
-	    } else if (invaliddata > 50 ) {
-	        ok = false;
-	    } else {
-	        ok = false;
-	    }
-	}
-	// print status of input stream
-	if ( ascii_in.error_type() != 0 ) {
-            std::cout << "processing of @srcdir@/testAscii.input ended with error "
-	              << ascii_in.error_type() << std::endl;
-            std::cout << "  --- " << ascii_in.error_message() << std::endl;
+	    // clean up and get next event
+	    delete evt;
+	    ascii_in >> evt;
+	}
 	//........................................PRINT RESULT
 	std::cout << icount << " events processed. Finished." << std::endl;
+}
+{
     // extended (complete) output
     HepMC::IO_GenEvent xin("@srcdir@/testHepMCExtended.input",std::ios::in);
     // declare another IO_GenEvent for output
     HepMC::IO_GenEvent xout("testIOHepMCExtended.dat",std::ios::out);
-    IsGoodEvent is_good_event;
     //........................................EVENT LOOP
     int icount=0;
-    int invaliddata=0;
-    bool ok = true;
-    int num_good_events=0;
     HepMC::GenEvent* evt = xin.read_next_event();
-    //while ( evt ) {
-    while ( ok ) {
-	if( evt ) {
-	    icount++;
-	    if ( icount%50==1 ) std::cout << "Processing Event Number " << icount
-					  << " its # " << evt->event_number()
-					  << std::endl;
-	    //xout << evt;
-	    if ( is_good_event(evt) ) {
-		xout << evt;
-		++num_good_events;
-	    }
+    while ( evt ) {
+	icount++;
+	if ( icount%50==1 ) std::cout << "Processing Event Number " << icount
+				      << " its # " << evt->event_number()
+				      << std::endl;
+	xout << evt;
-	    // clean up and get next event
-	    delete evt;
-	    xin >> evt;
-	} else if (xin.error_type() == HepMC::IO_Exception::InvalidData ) {
-	    ++invaliddata;
-            std::cerr << "INPUT ERROR: " << xin.error_message() << std::endl;
-	    // clean up and get next event
-	    delete evt;
-	    xin >> evt;
-	} else if (invaliddata > 50 ) {
-            std::cerr << "INPUT ERROR: " << xin.error_message() << std::endl;
-	    ok = false;
-	} else {
-	    ok = false;
-	}
-    }
-    // print status of input stream
-    if ( xin.error_type() != 0 ) {
-        std::cout << "processing of @srcdir@/testHepMCExtended.input ended with error "
-	          << xin.error_type() << std::endl;
-        std::cout << "  --- " << xin.error_message() << std::endl;
+	// clean up and get next event
+	delete evt;
+	xin >> evt;
+    }
     std::cout << icount << " events processed. Finished." << std::endl;
+}
 void read_various()
 				      << std::endl;
 	ascii_out << evt;
 	// clean up and get next event
 	delete evt;
 	ascii_in >> evt;
-    }
-    // print status of input stream
-    if ( ascii_in.error_type() != 0 ) {
-        std::cout << "processing of @srcdir@/testHepMCVarious.input ended with error "
-	          << ascii_in.error_type() << std::endl;
-        std::cout << "  --- " << ascii_in.error_message() << std::endl;
+    }
     //........................................PRINT RESULT
     std::cout << icount << " events processed. Finished." << std::endl;
+}