Index: fact/tools/rootmacros/fpeak_cfd.C
===================================================================
--- fact/tools/rootmacros/fpeak_cfd.C	(revision 12651)
+++ fact/tools/rootmacros/fpeak_cfd.C	(revision 12673)
@@ -104,5 +104,5 @@
 	float threshold = 5.0,
 	int verbosityLevel = 1, // different verbosity levels can be implemented here
-	bool ProduceGraphic = true
+	bool ProduceGraphic = false
 	)
 {
@@ -176,4 +176,6 @@
 // Loops over Every Event and Pixel
 //-----------------------------------------------------------------------------
+	cout << "Processing Events in total: " << nevents << endl;
+
 	for ( int ev = firstevent; ev < firstevent + nevents; ev++) {
 		// Get an Event --> consists of 1440 Pixel ...erm....data
@@ -182,12 +184,24 @@
 		for ( int pix = firstpixel; pix < firstpixel+npixel; pix++ ){
 			if (verbosityLevel > 0){
-				if (pix == firstpixel){
-					cout << "Processing Event: " << CurrentEventID << "/" << nevents << endl;
+				if ( pix == (firstpixel + npixel - 1) ) {
+					if (ev == firstevent) {
+					    printf ("%06d done", CurrentEventID);
+					    fflush(stdout);
+					} else {
+					    printf ("\b\b\b\b\b\b\b\b\b\b\b%06d done", CurrentEventID);
+					    fflush(stdout);
+					}
 				}
 			}
 
+			if ((pix+1)%9==0){
+			applyDrsCalibration( Ameas,pix,12,60,
+				Offset, Gain, TriggerOffset,
+				RegionOfInterest, AllPixelDataVector, StartCellVector);
+			}else{
 			applyDrsCalibration( Ameas,pix,12,12,
 				Offset, Gain, TriggerOffset,
 				RegionOfInterest, AllPixelDataVector, StartCellVector);
+			}
 
 			// finds spikes in the raw data, and interpolates the value
@@ -301,4 +315,7 @@
 			break;
 	}	// end of loop over pixels
+	
+	cout << "Event processing done." << endl;  
+
 if (ProduceGraphic){
 	TCanvas * cSpektrum;
@@ -310,5 +327,7 @@
   cSpektrum->Update();
 }
-	SaveHistograms( OutRootFileName );
+	if ( strlen(OutRootFileName) != 0){
+		SaveHistograms( OutRootFileName );
+	}
 	return( 0 );
 }